From 27eceebbb43d2a95a303d7638ceaecc5cd495306 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 13 Mar 2018 10:12:20 +0000
Subject: [PATCH] Bug 10442: Remove references to non-standard "error" class

The CSS for <div class="error"> is obsolete and should not be used. This
patch removes the definition from the main CSS file and corrects
instances of its use in the templates to the standard <div class="dialog
alert">.

To test:

- In Acquisitions -> Late orders, locate an order from a vendor which
  doesn't have an email address. Selecting that order and clicking
  "Claim" should trigger an error dialog, "This vendor has no email." It
  should be styled correctly.

- With  AcqCreateItem set to "when placing an order," add to an existing
  order using the "From a new (empty) record" option. Add two items with
  identical barcodes and submit the form. A error should show at
  the top of the page.

- With AcqCreateItem set to "when receiving an order," receive an order
  and add two items with identical barcodes. Submitting the form should
  trigger an error message at the top of the page.

With the remaining cases I don't know how to trigger the errors in
question, so a visual check of the changes may be required:

- Administration -> Funds -> "You are not authorized to modify this
  fund"
- Administration -> Search engine configuration
  (/admin/searchengine/elasticsearch/mappgings.pl) -> Various
  modification errors.
- With the  AutoEmailOpacUser preference set to "send," adding a patron
  without an email address can trigger an error, "This member has no
  email."
- With plugins enabled, and installed, there are error messages
  displayed under various circumstances.
---
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css              |  7 -------
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt    |  6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt  |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt     |  2 +-
 .../en/modules/admin/searchengine/elasticsearch/mappings.tt    |  4 ++--
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt    |  4 ++--
 .../intranet-tmpl/prog/en/modules/plugins/plugins-home.tt      |  8 ++++++--
 koha-tmpl/intranet-tmpl/prog/js/additem.js                     | 10 +++++-----
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index 5557bfc..cc4898a 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -1010,13 +1010,6 @@ ul.fa-ul li {
     list-style-type: none;
 }
 
-div.error {
-	border : 2px dashed #990000;
-	background-color : #FFFF99;
-	padding : .5em;
-	margin : 1em;
-}
-
 input.alert {
 	background-color : #FFFF99;
 	border-color: #900;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 7711a33..5fb5d39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -25,11 +25,11 @@
 
 [% IF error_claim %]
     [% IF ( error_claim == "no_email" ) %]
-        <div class="error">This vendor has no email</div>
+        <div class="dialog alert">This vendor has no email</div>
     [% ELSIF ( error_claim == "no_order_selected" ) %]
-        <div class="error">No order selected</div>
+        <div class="dialog alert">No order selected</div>
     [% ELSE %]
-        <div class="error">[% error_claim %]</div>
+        <div class="dialog alert">[% error_claim %]</div>
     [% END %]
 [% END %]
 [% IF info_claim %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 1a10af9..fca2896 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -28,7 +28,7 @@
     [% END %]
 </h2>
 
-<div class="error" style="display:none"></div>
+<div class="dialog alert order_error" style="display:none"></div>
 
 [% IF ( basketno ) %]
     <div id="acqui_basket_summary"  class="yui-g">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 8bb7841..362fbd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -26,7 +26,7 @@
     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
 <div class="yui-g">
 <div class="yui-u first">
-    <div class="error" style="display:none"></div>
+    <div class="dialog alert order_error" style="display:none"></div>
 
     <fieldset class="rows">
     <legend>Catalog details</legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index dd72013..6d07e4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -33,7 +33,7 @@
 [% UNLESS op == 'delete_confirm' %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
 
 [% IF (error_not_authorised_to_modify) %]
-    <div class="error">
+    <div class="dialog alert">
         <p>You are not authorized to modify this fund</p>
     </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index 1cb3c41..cb850c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -88,11 +88,11 @@ a.add, a.delete {
     [% END %]
 
     <h1>Search engine configuration</h1>
-    <div class="warning">
+    <div class="dialog message">
         Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.
     </div>
     [% IF errors %]
-        <div class="error">
+        <div class="dialog alert">
         Changes have not been applied. Please check the following values:
           <ul>
             [% FOREACH e IN errors %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 3635360..5346b85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -23,9 +23,9 @@
 	<div class="yui-b">
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
-            <div class="error">This member has no email</div>
+            <div class="dialog alert">This member has no email</div>
         [% ELSE %]
-            <div class="error">[% error_alert %]</div>
+            <div class="dialog alert">[% error_alert %]</div>
         [% END %]
     [% END %]
     [% IF info_alert %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index ee9c1a0..e445dea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -77,11 +77,15 @@
                                         [% plugin.metadata.description %]
 
                                         [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %]
-                                            <div class="error">Warning: This report was written for a newer version of Koha. Run at your own risk.</div>
+                                            <div class="dialog alert">
+                                                Warning: This report was written for a newer version of Koha. Run at your own risk.
+                                            </div>
                                         [% END %]
 
                                         [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %]
-                                            <div class="error">Warning: This report was written for an older version of Koha. Run at your own risk.</div>
+                                            <div class="dialog alert">
+                                                Warning: This report was written for an older version of Koha. Run at your own risk.
+                                            </div>
                                         [% END %]
                                     </td>
                                     <td>[% plugin.metadata.author %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js
index 6e4bf33..78b5780 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js
@@ -249,7 +249,7 @@ function check_additem(unique_item_fields) {
     data['field'] = new Array();
     data['value'] = new Array();
     var array_fields = unique_item_fields.split(' ');
-    $(".error").empty(); // Clear error div
+    $(".order_error").empty(); // Clear error div
 
     // Check if a value is duplicated in form
     for ( field in array_fields ) {
@@ -270,7 +270,7 @@ function check_additem(unique_item_fields) {
         var sorted_arr = values.sort();
         for (var i = 0; i < sorted_arr.length - 1; i += 1) {
             if (sorted_arr[i + 1] == sorted_arr[i]) {
-                $(".error").append(
+                $(".order_error").append(
                     fieldname + " '" + sorted_arr[i] + "' "
                     + (window.MSG_ADDITEM_JS_IS_DUPLICATE || "is duplicated")
                     + "<br/>");
@@ -281,7 +281,7 @@ function check_additem(unique_item_fields) {
 
     // If there is a duplication, we raise an error
     if ( success == false ) {
-        $(".error").show();
+        $(".order_error").show();
         return false;
     }
 
@@ -295,7 +295,7 @@ function check_additem(unique_item_fields) {
                 success = false;
                 for (var i=0; i < data[field].length; i++) {
                     var value = data[field][i];
-                    $(".error").append(
+                    $(".order_error").append(
                         field + " '" + value + "' "
                         + (window.MSG_ADDITEM_JS_ALREADY_EXISTS_IN_DB
                             || "already exists in database")
@@ -307,7 +307,7 @@ function check_additem(unique_item_fields) {
     });
 
     if ( success == false ) {
-        $(".error").show();
+        $(".order_error").show();
     }
     return success;
 }
-- 
2.1.4