From 86e458a3ce4ef327a96e051ee2c608b737aa6a74 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 11 Dec 2007 09:41:30 -0600
Subject: [PATCH] Standardizing format for error/message dialogs. <div
 class="dialog alert"> for high-priority warnings/confirmations. <div
 class="dialog message"> for lower priority/informational messages.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |  77 +++++++++---------
 .../en/modules/admin/biblio_framework.tmpl    |  10 +--
 .../prog/en/modules/admin/categorie.tmpl      |   5 +-
 .../prog/en/modules/admin/itemtypes.tmpl      |  33 +++++---
 .../en/modules/cataloguing/addbiblio.tmpl     |   6 +-
 .../prog/en/modules/circ/circulation.tmpl     |   7 +-
 .../prog/en/modules/circ/returns.tmpl         |   2 +-
 .../prog/en/modules/sms/sms-home.tmpl         |  10 +--
 .../prog/en/modules/tools/inventory.tmpl      |   8 +-
 .../prog/en/modules/tools/overduerules.tmpl   |   4 +-
 .../prog/en/modules/tools/picture-upload.tmpl |   8 --
 .../en/modules/virtualshelves/shelves.tmpl    |  12 +--
 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif | Bin 0 -> 2255 bytes
 .../intranet-tmpl/prog/img/message-bg.gif     | Bin 0 -> 966 bytes
 14 files changed, 89 insertions(+), 93 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/message-bg.gif

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 3c292b7f1b..2faefefb88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -457,13 +457,6 @@ ul.toolbar li {
 	list-style : none;
 }
 
-div.message {
-   border : 1px solid #6699CC;
-	width : 75%;
-	margin : 1em auto;
-	padding : .5em;
-}
-
 div.patroninfo {
 	margin-top : -.5em;
 }
@@ -810,35 +803,35 @@ fieldset.rows .inputnote {
 }
 #addbiblio a, #addchild a, #newentry a {
 	padding-left : 34px;
-	background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif");
+	background-image: url("../../img/toolbar-new.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
 #deletebiblio button, #deletebiblio a, #deletepatron a {
 	padding-left : 34px;
-	background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif");
+	background-image: url("../../img/toolbar-delete.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
 #printbiblio button, #printbiblio a {
 	padding-left : 34px;
-	background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif");
+	background-image: url("../../img/toolbar-print.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
 #addtoshelf button, #addtoshelf a {
 	padding-left : 34px;
-	background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif");
+	background-image: url("../../img/toolbar-add-to-shelf.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
 #placehold a {
 	padding-left : 34px;
-	background-image: url("/intranet-tmpl/prog/img/toolbar-hold.gif");
+	background-image: url("../../img/toolbar-hold.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
@@ -951,7 +944,6 @@ div.circmessage:first-child {
 }
 
 div.circmessage {
-	border: 1px solid #CCC;
 	padding: .4em;
 	margin-bottom : .3em;
 }
@@ -965,56 +957,61 @@ div.first fieldset {
 	margin-right : 0;
 }
 
-.dialog {
-  width: 50%;
-  float:left;
-  background: url(../../img/dropshadow-alpha.png) no-repeat bottom right !important;
-  background: url(../../img/dropshadow.gif) no-repeat bottom right;
-  margin: 10px 0 0 10px !important;
-  margin: 10px 0 0 5px;
-  }
-
-.dialog div {
-  background: none !important;
-  background: url(../../img/dropshadow-mask.gif) no-repeat left top;
-  padding: 0 !important;
-  padding: 0 6px 6px 0;
-  }
+#circ_needsconfirmation {
+	margin : auto;
+}
 
-.dialog div.confirm {
-  background-color: #ffc;
- // background : url(../../img/dialog-bg.gif) repeat-x left 0 !important;
-  font: 1em sans-serif;
+.dialog {
   border: 1px solid #bcbcbc;
-  padding: 4px !important;
-  margin: -6px 6px 6px -6px !important;
-  margin: 0;
+	padding : .5em;
+	margin : 1em auto;
+  width: 65%;
   }
   
-  .dialog div.confirm h2, .dialog div.confirm h3, .dialog div.confirm h4 {
+.dialog  h2, .dialog h3, .dialog h4 {
   	margin : auto;
 	text-align : center;
   }
   
- div.confirm input {
+.dialog input {
  	background-color : #FFF;
  	border : 1px solid #bcbcbc;
 	margin : .4em;
 	padding : .4em .4em .4em 25px;
  }
  
- div.confirm input.approve {
+.dialog input.approve {
  	background : #FFF url(../../img/approve.gif) no-repeat 4px center;
  }
 
- div.confirm input.deny {
+.dialog input.deny {
  	background : #FFF url(../../img/deny.gif) no-repeat 4px center;
  }
  
- div.confirm input:hover {
+.dialog input:hover {
  	background-color : #ffc;
  }
  
+div.alert {
+  background : #FFC url(../../img/alert-bg.gif) repeat-x left 0;
+  text-align : center;
+}
+
+div.alert strong {
+	color : #900;
+}
+
+div.message {
+	background : white url("../../img/message-bg.gif") repeat-x left 0;
+   border : 1px solid #bcbcbc;
+	width : 55%;
+}
+
+div.message input.approve {
+	display : block;
+	margin: auto;
+}
+ 
  div.results {
  	padding : .7em 0;
  }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index d1cf3d69bb..06456209fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -108,14 +108,14 @@ function Check(f) {
     </form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
+<!-- TMPL_IF NAME="delete_confirm" --><div class="dialog alert">
+<h3>Delete framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
     <!-- TMPL_IF NAME="total" -->
-        <div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
+        <strong>This framework is used <!-- TMPL_VAR NAME="total" --> times</strong>.
     <!-- /TMPL_IF -->
-        <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" />
+        <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="approve" value="Yes, Delete this Framework!" />
         </form>
-        <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" /></form>
+        <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="deny" value="No, Do not Delete!" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 40f2d5a373..cdfb684e14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -149,9 +149,10 @@
     	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<fieldset><legend>    	
 	<!-- TMPL_IF NAME="totalgtzero" -->
-	Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!<!-- TMPL_ELSE -->
+	Category <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!<!-- TMPL_ELSE -->
 Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></legend>
-<!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="totalgtzero" --><div class="dialog alert"><strong>This category is used <!-- TMPL_VAR NAME="total" --> times</strong>. Deletion not possible</div><!-- /TMPL_IF -->
 	<table>
 	<tr><th scope="row">Category code: </th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
 	<tr><th scope="row">Description: </th><td><!-- TMPL_VAR NAME="description" --></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index f8ee05b352..00cfcc418d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -220,32 +220,39 @@ Item Types Administration
 	  </ol>
     </fieldset>
 
-    <p id="action">
+    <fieldset class="action">
       <input type="button" value="Save Changes" onclick="Check(this.form)" />
-    </p>
+	  <a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a>
+    </fieldset>
 </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-<!-- TMPL_IF name="total" --><div class="error">This record is used <!-- TMPL_VAR name="total" --> times. Deletion is not possible.<!-- /TMPL_IF -->
-<div class="table details">	<table>
-	<caption><!-- TMPL_IF name="total" -->Cannot Delete Item Type<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --></caption>
+<!-- TMPL_IF name="total" --><div class="dialog message">
+<h3>Cannot Delete Item Type</h3>
+<p><strong>This record is used <!-- TMPL_VAR name="total" --> times</strong>. Deletion is not possible.</p>
+<!-- TMPL_ELSE --><div class="dialog alert">
+<h3>Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?</h3>
+<!-- /TMPL_IF -->
+<table>
 		<tr>
-			<th>Item type</th>
+			<th scope="row">Item type</th>
 			<td><!-- TMPL_VAR name="itemtype" --></td>
 		</tr>
 
-	<tr><th>Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
-	<tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
-	<tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
-<!-- Hide from NPL  --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- Hide from NPL --></table>
+	<tr><th scope="row">Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
+	<tr><th scope="row">Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
+	<tr><th scope="row">Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr></table>
 		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_IF name="total" -->
-		</form><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="OK" /></form>
+		</form>
+		
+		<form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" class="approve" value="OK" /></form>
 	<!-- TMPL_ELSE -->
-		<input type="submit" value="Delete this Item Type" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+		<input type="submit" class="approve" value="Delete this Item Type" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" class="deny" value="Do Not Delete" /></form>
 	<!-- /TMPL_IF -->
-
+</div>
 	
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index f04d01f124..6e9557271b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -442,15 +442,15 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 <!-- TMPL_UNLESS name="number" -->
     <!-- show duplicate warning on tab 0 only -->
         <!-- TMPL_IF name="duplicatebiblionumber" -->
-                    <div class="error">
+                    <div class="dialog alert">
                         <h4>Duplicate Record?</h4>
                         <p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
                         <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
                             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="duplicatebiblionumber" -->" />
-                            <input type="submit" value="Yes: Edit existing items" />
+                            <input type="submit" class="approve" value="Yes: Edit existing items" />
                         </form>
                         <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">
-                            <input type="submit" onclick="confirmnotdup(); return false;" value="No: Save as New Record" />
+                            <input type="submit" class="deny" onclick="confirmnotdup(); return false;" value="No: Save as New Record" />
                         </form>
                     </div>
         <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 647046c991..cfc6f207bf 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -45,8 +45,9 @@
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
 
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-<div class="yui-g" style="text-align: center"><div id="circ_needsconfirmation" class="dialog">
-<div><div class="confirm">
+<div class="yui-g" style="text-align: center">
+
+<div id="circ_needsconfirmation" class="dialog alert">
 <h3>Please Confirm Checkout</h3>
 
 <ul>
@@ -106,7 +107,7 @@
     <input type="submit" class="deny" value="No, Don't Check Out (N)" accesskey="n" />
 </form>
 
-</div></div></div></div>
+</div></div>
 
 <!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 7fef659253..31b34d191c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -38,7 +38,7 @@
 
 <!-- TMPL_IF Name="found" -->
 <!-- found -->
-<div class="message">
+<div class="dialog message">
 <!-- case of a reservation found, and display info -->
     <!-- TMPL_IF Name="waiting" -->
 	<!-- waiting -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
index db83c3abe1..e9e80f49a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; SMS Administration</title>
+<title>Koha &rsaquo; Tools &rsaquo; Send SMS Message</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; SMS Administration</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Send SMS Message</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -14,7 +14,7 @@
        <div id="yui-main">
 	       <div class="yui-b">
 
-<!--TMPL_IF NAME="error"--><div class="error"><!--TMPL_VAR NAME="error"--> </div><!--/TMPL_IF-->
+<!--TMPL_IF NAME="error"--><div class="dialog alert"><!--TMPL_VAR NAME="error"--> </div><!--/TMPL_IF-->
 <form action="/cgi-bin/koha/sms/sms.pl" method="post">
 <fieldset class="rows">
 <legend>SMS Messaging</legend>
@@ -23,11 +23,9 @@
 	<li><label for="phone">Phone:</label><input type="text" name="phone" id="phone" value="<!--TMPL_VAR NAME="phone"-->"/> (e.g., 5338644143)</li>
 </ol>
 </fieldset>
-<fieldset class="action"><input type="submit" value="Send SMS"></fieldset>
+<fieldset class="action"><input type="submit" value="Send SMS"><a class="cancel" href="/cgi-bin/koha/sms/sms.pl">Cancel</a></fieldset>
 </form>
 
-<div class="message">Enter a message. The message will be sent to the user.</div>
-
 </div>
 </div>
 <div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 07dfebf73a..59d9613f9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -98,16 +98,16 @@
     </form>
 	</div>
 	</div>
-    <!--TMPL_IF Name="Number" --><p><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></p><!-- /TMPL_IF-->
-    <!--TMPL_IF Name="errorfile" --><p class="error"><!--TMPL_VAR Name="errorfile"--> can't be opened</p><!-- /TMPL_IF-->
+    <!--TMPL_IF Name="Number" --><div class="dialog message"><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></div><!-- /TMPL_IF-->
+    <!--TMPL_IF Name="errorfile" --><div class="dialog alert"><!--TMPL_VAR Name="errorfile"--> can't be opened</div><!-- /TMPL_IF-->
     <!--TMPL_LOOP Name="errorloop"-->
-        <p class="error">
+        <div class="dialog alert">
             <!--TMPL_VAR Name="barcode"-->
             <!--TMPL_IF Name="ERR_BARCODE"-->: barcode not found<!--/TMPL_IF-->
             <!--TMPL_IF Name="ERR_WTHDRAWN"-->: item withdrawn<!--/TMPL_IF-->
             <!--TMPL_IF Name="ERR_ONLOAN_RET"-->: item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
             <!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"-->: item was on loan. couldn't be returned.<!--/TMPL_IF-->
-        </p>
+        </div>
     <!-- /TMPL_LOOP-->
     <!-- TMPL_IF NAME="loop" -->
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index 4c270ed780..aaeb4a2cd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -35,7 +35,7 @@
                 <input type="submit" value="Select" />
             </form>
             <!--TMPL_IF Name="ERROR"-->
-            <div class="error">
+            <div class="dialog alert">
                 <h3>Data error</h3>
                 <p>The following fields have a forbidden value. Correct them and press OK again :</p>
                 <ul>
@@ -69,7 +69,7 @@
                             <!-- TMPL_ELSE -->
                                 <tr>
                             <!-- /TMPL_IF -->
-                            <th><!-- TMPL_VAR NAME="line" --></th>
+                            <th scope="row"><!-- TMPL_VAR NAME="line" --></th>
 <td>
                                 <input name="delay1-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay1" -->" />
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
index 7fdc7b645c..143483c515 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
@@ -31,11 +31,7 @@
 <!-- TMPL_ELSE -->
 
     <!-- TMPL_IF name="ERRORS" -->
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
         <div class="dialog alert"><ul>
-=======
-        <ul class="error">
->>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
         <!-- TMPL_LOOP name="ERRORS" -->
 		<!-- TMPL_IF NAME="NODIR" -->
 			<li>The <span class="ex">patronimages/</span> directory isn't present on your server, please ask your systems administrator to create it</li>
@@ -53,11 +49,7 @@
             <li>The upload file appears to be empty.</li>
         <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
 		</ul></div>
-=======
-		</ul>
->>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
     <!-- /TMPL_IF -->
 	
 	<form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index b52dd6deed..742e03f4f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -164,13 +164,13 @@ function confirmDelete(s,n){
     <!-- TMPL_IF NAME="shelves" -->
 <div class="yui-ge">
 	<div class="yui-u first">
-		<!-- TMPL_IF NAME="already" --><p class="error">A virtual shelf with that name already exists!</p><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="already" --><div class="dialog alert">A virtual shelf with that name already exists!</div><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="status1" -->
-            <p class="error"><!-- TMPL_VAR NAME="string1" --></p>
+            <div class="dialog alert"><!-- TMPL_VAR NAME="string1" --></div>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="paramsloop" -->
             <!-- TMPL_IF NAME="status" -->
-                <p class="error"><!-- TMPL_VAR NAME="string" --></p>
+                <div class="dialog alert"><!-- TMPL_VAR NAME="string" --></div>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl">
@@ -185,7 +185,7 @@ function confirmDelete(s,n){
                                     <option value="2">Public</option>
 									<option value="3">Free</option></select></li></ol></fieldset>
  
-		<p><input type="submit" value="Save" /></p>
+	 <fieldset class="action"><input type="submit" value="Save" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
 		</form>
                      
 
@@ -203,7 +203,7 @@ function confirmDelete(s,n){
     <!-- TMPL_IF name="edit" -->
 	<div class="yui-ge">
 	<div class="yui-u first">
-	<!-- TMPL_IF NAME="already" --><p class="error">A virtual shelf with that name already exists!</p><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="already" --><div class="dialog alert">A virtual shelf with that name already exists!</div><!-- /TMPL_IF -->
         <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl">
             <input type="hidden" name="op" value="modifsave" />
             <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" />
@@ -228,7 +228,7 @@ function confirmDelete(s,n){
                     <!-- /TMPL_IF -->
                 </select></li>
             </ol></fieldset>
-            <p><input type="submit" value="Save changes" /></p>
+            <fieldset class="action"><input type="submit" value="Save changes" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
 			
         </form>
 		</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44625a2ec273b20a2708ba2c8f3489b92113a480
GIT binary patch
literal 2255
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
ZH%l!;xaj8G7}>H%mu2{ag9k9D{{x||N9O<l

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/message-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/message-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..553546f9b52df90ae0db48554d586f49c0663a03
GIT binary patch
literal 966
zcmcJL=}(#m0LEEth&{HLv@xb}J<`P>nyyP1<Bks|ZJ0%Cn{+d#>9uq*2+d;F#+a^I
zsC0^=)mBSwMGjHqP(eVTf`YRuf{Ke(+acu=cn|L51;oPY{)asuo)5ndzvOv-xPUAD
z=I4{Bu20rcs6aUG55?g?EEq|6gNQGPL}JM(vJ;9X!qKERfPnrO96-W*FbVr(p-93P
zLUvNSnM@`eP3-Qb<H=MyoeqXS^0+@7kHvQ)ND}hLKwk{-A%HK2`ag3rx$i%H@m}w3
zLZLId*81||qn&fK-xlwD%UW)`habHv{;9RW=)14IPHU_@-Dh%j++Y4xZS_$eREf=j
zgys)ZAeA9MY@#%N*4#pEZKJh!JnqbY^0d3>8NCPn;$<JBpUGl#2DpPmykWjT$oh12
zOe`6f%H$IYrAoG6t(ltE>Sq3$eLXk7pr1QpTv}c+t*&IRy;<MbeEaSn^Oohk)n<2C
za$If?079_W=g$g;!jWhUi6@dD|NM~7pt26+Q#tGzO7>yw`D`|4wk78jo>4wNFh|Qf
zOWe|ra~C>KoV)s_OggyOjk&@+q>~OApP#vHU|f*#mitQYLR*WnVN-@xMyk!j%lUtE
z%R6v22DxBu_%avYkDnl~i)v&<i(x{vDZVw^_IZV3<elu=e*Sf%V$`gxcN+RDlw%fk
zV+67omEtBXIqTrDN|nSuOFdk4W2y8j%0kzv3TEXisms`VmNZt(mU&F<bF^a@C*|N8
z|BC3w^5g`(DLJlZUQ{c5X4PHzy@jI;Sap<x$E!4|kW=4XbaO@XD&kq?R<Nq3CS&kh
z8OgdbrH%(|Lto}yn${#Ez?$f$X?iLZ51N1Py`-J~kV-^gt4XWPWKd{~jl3_HV0)Nd
zz_&FWDgkVi92~~}=twoe{%2k--`<?x066U}N1IMKs9(?tj#dnh?`SJl01n!jd5p9D
z>kWdlqtwlJKK>p7oSkLp!tJi}xpmu5$_oVBPb*8n?e5FCLRZg^)pf3CHMIg4{aOR)
zdVZ_9(B1nBz0UoDz!SJ%-cf+=zWVt>598iOou|LiE$}cOAfSguMq>f?qg*1up&Al1
z1MMXc!0p0e!NHztA~@7rD+GCr1_&HxH)A3GAe{&a_&gyb98o}!NHULwN8}qscvR&U
k!ebf)g2g&?kyr9Mm*gGS7l^#lr4raHTg8z`IjHac1(BF02mk;8

literal 0
HcmV?d00001

-- 
2.20.1