From 3741dc704f0bc2bcd11f4adb53bbfe6e59a2c136 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Feb 2016 13:45:54 -0500 Subject: [PATCH] [SIGNED-OFF]Bug 15920: Clean up and fix errors in batch checkout template The batch checkout template has some markup and JavaScript problems which need to be resolved, including: - Mismatched

- JavaScript includes which are not used - Incorrect DataTables configuration - Incorrect class on warning dialogs - Incorrect terminology: Use "checkout" instead of "issue" This patch also changes the markup and styling of batch checkout errors, using Font Awesome icons to retain highlighting of warnings and errors while (I hope) improving readability. To test, apply the patch and go to batch checkout for a patron for whom batch checkouts are enabled. - Check out a batch of barcodes. Include items which will trigger errors or warnings. For example: Invalid barcodes, lost items, items which are already checked out, items which are on hold for another patron, items which are damaged. - When the table of items is displayed so that you can confirm the checkout, make sure the table is sortable. - Think about whether the style changes on warnings and errors are an improvement. - Try to initiate a batch checkout to a patron who is restricted. You should see an "alert" style dialog instead of a "message" style one. - Validate the HTML and confirm that there are no errors raised by this template's markup. Signed-off-by: Hector Castro Works as described --- .../intranet-tmpl/prog/en/css/staff-global.css | 22 ++-- .../en/modules/circ/circulation_batch_checkouts.tt | 107 ++++++++++---------- 2 files changed, 67 insertions(+), 62 deletions(-) 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 d5f9b30..ca1e18f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -929,6 +929,21 @@ fieldset.rows .inputnote { color: #cc0000; } +/* Font Awesome icon */ +.error i { + color: #CC0000; +} + +/* Font Awesome icon */ +.warn i { + color: orange; +} + +/* For Font Awesome icon bullets */ +ul.fa-ul li { + list-style-type: none; +} + div.error { border : 2px dashed #990000; background-color : #FFFF99; @@ -2839,10 +2854,3 @@ div#cn_browser_table_wrapper > table#cn_browser_table { margin: auto; width:90%; } - -td p.error { - color: red; -} -td p.warn { - color: orange; -} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index d73348c..8118251 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -15,9 +15,6 @@ [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - -