Bugzilla – Attachment 81615 Details for
Bug 10442
Remove references to non-standard "error" class
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10442: Remove references to non-standard "error" class
Bug-10442-Remove-references-to-non-standard-error-.patch (text/plain), 10.98 KB, created by
Andrew Isherwood
on 2018-10-30 11:33:41 UTC
(
hide
)
Description:
Bug 10442: Remove references to non-standard "error" class
Filename:
MIME Type:
Creator:
Andrew Isherwood
Created:
2018-10-30 11:33:41 UTC
Size:
10.98 KB
patch
obsolete
>From 4a4490477761cf09c1cf1b7b357779a692dbeac8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 13 Aug 2018 13:39:42 +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. > >Signed-off-by: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >--- > koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 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/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" ) %] >- <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 | html %]</div> >+ <div class="dialog alert">[% error_claim | html %]</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 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 %] > </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 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 @@ > <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);"> > <div class="row"> > <div class="col-sm-6"> >- <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 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) %] >- <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 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 %] > > <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 be03649b2a..2b55a08a7c 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" ) %] >- <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 | html %]</div> >+ <div class="dialog alert">[% error_alert | html %]</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 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 ) %] >- <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 | html %]</td> >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") > + "<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.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10442
:
18824
|
19281
|
19296
|
72785
|
77022
|
77742
|
78413
|
81615
|
81646