From 52028d9932ce1d10ad690261d8f6983b074b2909 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 13 Aug 2018 13:39:42 +0000 Subject: [PATCH] Bug 10442: Remove references to non-standard "error" class The CSS for
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
. 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. Signed-off-by: Andrew Isherwood Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 7 ------- .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 6 +++--- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- .../admin/searchengine/elasticsearch/mappings.tt | 4 ++-- .../prog/en/modules/members/memberentrygen.tt | 4 ++-- .../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/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index aea21cc2a9..d3e37df927 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1311,13 +1311,6 @@ div { } } - &.error { - background-color: #FFFF99; - border: 2px dashed #990000; - margin: 1em; - padding: .5em; - } - &.first { fieldset { margin-right: 0; 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 ba7e8b9c7d..637686b7ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -26,11 +26,11 @@ [% IF error_claim %] [% IF ( error_claim == "no_email" ) %] -
This vendor has no email
+
This vendor has no email
[% ELSIF ( error_claim == "no_order_selected" ) %] -
No order selected
+
No order selected
[% ELSE %] -
[% error_claim | html %]
+
[% error_claim | html %]
[% 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 8fa11617dc..7cf4e2e6e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -30,7 +30,7 @@ [% END %] - + [% IF ( basketno ) %]
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 7cfe2e89ce..fc2ff7efe2 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 @@
- +
Catalog details 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 82a27eb2fe..ce45d2589c 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) %] -
+

You are not authorized to modify this fund

[% 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 cc7b28cb85..21efbd3814 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 @@ -90,11 +90,11 @@ a.add, a.delete { [% END %]

Search engine configuration

-
+
Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.
[% IF errors %] -
+
Changes have not been applied. Please check the following values:
    [% 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 e72944eb13..143af0aca5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -38,9 +38,9 @@ [% INCLUDE 'blocking_errors.inc' %] [% IF error_alert %] [% IF ( error_alert == "no_email" ) %] -
    This member has no email
    +
    This member has no email
    [% ELSE %] -
    [% error_alert | html %]
    +
    [% error_alert | html %]
    [% 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 5823be2c39..a6c8a3d7d3 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 @@ -78,11 +78,15 @@ [% plugin.metadata.description | html %] [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] -
    Warning: This report was written for a newer version of Koha. Run at your own risk.
    +
    + Warning: This report was written for a newer version of Koha. Run at your own risk. +
    [% END %] [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] -
    Warning: This report was written for an older version of Koha. Run at your own risk.
    +
    + Warning: This report was written for an older version of Koha. Run at your own risk. +
    [% END %] [% plugin.metadata.author | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js index 6e4bf33444..78b5780a7b 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") + "
    "); @@ -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.39.5