Bugzilla – Attachment 175664 Details for
Bug 38664
Tidy the whole codebase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38664: Fixes for list and some tools templates
Bug-38664-Fixes-for-list-and-some-tools-templates.patch (text/plain), 54.99 KB, created by
Owen Leonard
on 2024-12-18 18:40:36 UTC
(
hide
)
Description:
Bug 38664: Fixes for list and some tools templates
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-12-18 18:40:36 UTC
Size:
54.99 KB
patch
obsolete
>From afcd1d6a281b83d03b4ad465ee46cc9631d251bb Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 17 Dec 2024 15:48:13 +0000 >Subject: [PATCH] Bug 38664: Fixes for list and some tools templates > >tools/automatic_item_modification_by_age.tt >tools/batchMod-del.tt >tools/batchMod-edit.tt >tools/batch_delete_records.tt >tools/batch_extend_due_dates.tt >tools/batch_record_modification.tt >tools/cleanborrowers.tt >tools/export.tt >tools/import_borrowers.tt >tools/inventory.tt >tools/marc_modification_templates.tt >tools/overduerules.tt >tools/picture-upload.tt >tools/quotes.tt >tools/stage-marc-import.tt >tools/stockrotation.tt >tools/upload-images.tt >tools/viewlog.tt >virtualshelves/shelves.tt >--- > .../automatic_item_modification_by_age.tt | 20 +++--- > .../prog/en/modules/tools/batchMod-del.tt | 37 ++++++----- > .../prog/en/modules/tools/batchMod-edit.tt | 22 ++++--- > .../en/modules/tools/batch_delete_records.tt | 44 +++++++------ > .../modules/tools/batch_extend_due_dates.tt | 7 +- > .../tools/batch_record_modification.tt | 7 +- > .../prog/en/modules/tools/cleanborrowers.tt | 10 +-- > .../prog/en/modules/tools/export.tt | 12 ++-- > .../prog/en/modules/tools/import_borrowers.tt | 11 ++-- > .../prog/en/modules/tools/inventory.tt | 66 +++++++++++-------- > .../tools/marc_modification_templates.tt | 2 +- > .../prog/en/modules/tools/overduerules.tt | 6 +- > .../prog/en/modules/tools/picture-upload.tt | 7 +- > .../prog/en/modules/tools/quotes.tt | 2 +- > .../en/modules/tools/stage-marc-import.tt | 16 +++-- > .../prog/en/modules/tools/stockrotation.tt | 56 ++++++++-------- > .../prog/en/modules/tools/upload-images.tt | 22 +++---- > .../prog/en/modules/tools/viewlog.tt | 6 +- > .../prog/en/modules/virtualshelves/shelves.tt | 29 ++++---- > 19 files changed, 207 insertions(+), 175 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index c2a54b89ba..0220165856 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -47,8 +47,6 @@ > [% INCLUDE 'messages.inc' %] > > [% IF ( op == 'edit_form' ) %] >- <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> >- [% INCLUDE 'csrf-token.inc' %] > <h1>Rules for automatic item modifications by age</h1> > <div id="toolbar" class="btn-toolbar sticky"> > <div class="btn-group"> >@@ -75,16 +73,20 @@ > [% END %] > > [% FOR message IN messages %] >- [% IF message.type == "error" %] >- <div class="alert alert-warning"> >- [% END %] >- [% IF message.code == "unable_to_load_configuration" %] >- An error occurs: Unable to load the configuration. >- [% END %] >- </div> >+ [% SET message_class = "alert-info" %] >+ [% IF message.type == "error" %] >+ [% message_class = "alert-warning" %] >+ [% END %] >+ <div class="alert [% message_class | html %]"> >+ [% IF message.code == "unable_to_load_configuration" %] >+ An error occurs: Unable to load the configuration. >+ [% END %] >+ </div> > [% END %] > > [% IF op == 'edit_form' %] >+ <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> >+ [% INCLUDE 'csrf-token.inc' %] > <div id="edit_rules"> > <div id="rules"> > [% FOR rule IN rules %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index a6cdfa08a4..4852c77d93 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -60,20 +60,22 @@ > <h1>Batch item deletion</h1> > > [% FOREACH message IN messages %] >- [% IF message.type == 'success' %] >- <div class="alert alert-info"> >- [% ELSIF message.type == 'warning' %] >- <div class="alert alert-warning"> >- [% ELSIF message.type == 'error' %] >- <div class="alert alert-warning" style="margin:auto;"> >- [% END %] >- [% IF message.code == 'cannot_enqueue_job' %] >- <span>Cannot enqueue this job.</span> >- [% END %] >- [% IF message.error %] >- <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> >- [% END %] >- </div> >+ [% SET message_type = "alert-info" %] >+ [% IF message.type == 'success' %] >+ [% message_type = "alert-info" %] >+ [% ELSIF message.type == 'warning' %] >+ [% message_type = "alert-warning" %] >+ [% ELSIF message.type == 'error' %] >+ [% message_type = "alert-warning" %] >+ [% END %] >+ <div class="alert [% message_type | html %]"> >+ [% IF message.code == 'cannot_enqueue_job' %] >+ <span>Cannot enqueue this job.</span> >+ [% END %] >+ [% IF message.error %] >+ <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> >+ [% END %] >+ </div> > [% END %] > > >@@ -89,7 +91,7 @@ > </thead> > <tbody> > [% FOREACH notfoundbarcode IN notfoundbarcodes %] >- <tr><td>[% notfoundbarcode |html %]</td></td> >+ <tr><td>[% notfoundbarcode |html %]</td></tr> > [% END %] > </tbody> > </table> >@@ -104,7 +106,7 @@ > </thead> > <tbody> > [% FOREACH notfounditemnumber IN notfounditemnumbers %] >- <tr><td>[% notfounditemnumber |html %]</td></td> >+ <tr><td>[% notfounditemnumber |html %]</td></tr> > [% END %] > </tbody> > </table> >@@ -120,7 +122,7 @@ > </thead> > <tbody> > [% FOREACH barcode IN cannot_be_deleted %] >- <tr><td>[% barcode | html %]</td></td> >+ <tr><td>[% barcode | html %]</td></tr> > [% END %] > </tbody> > </table> >@@ -215,6 +217,7 @@ > > </div> > >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 5c3ff93d4f..fc6a6fb319 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -83,13 +83,15 @@ > [% END %] > > [% FOREACH message IN messages %] >- [% IF message.type == 'success' %] >- <div class="alert alert-info"> >- [% ELSIF message.type == 'warning' %] >- <div class="alert alert-warning"> >- [% ELSIF message.type == 'error' %] >- <div class="alert alert-warning" style="margin:auto;"> >- [% END %] >+ [% SET message_class = "alert-info" %] >+ [% IF message.type == 'success' %] >+ [% message_class = "alert-info" %] >+ [% ELSIF message.type == 'warning' %] >+ [% message_class = "alert-warning" %] >+ [% ELSIF message.type == 'error' %] >+ [% message_class = "alert-warning" %] >+ [% END %] >+ <div class="alert [% message_class | html %]"> > [% IF message.code == 'cannot_enqueue_job' %] > <span>Cannot enqueue this job.</span> > [% END %] >@@ -120,7 +122,7 @@ > </thead> > <tbody> > [% FOREACH notfoundbarcode IN notfoundbarcodes %] >- <tr><td>[% notfoundbarcode |html %]</td></td> >+ <tr><td>[% notfoundbarcode |html %]</td></tr> > [% END %] > </tbody> > </table> >@@ -143,7 +145,7 @@ > </thead> > <tbody> > [% FOREACH notfounditemnumber IN notfounditemnumbers %] >- <tr><td>[% notfounditemnumber |html %]</td></td> >+ <tr><td>[% notfounditemnumber |html %]</td></tr> > [% END %] > </tbody> > </table> >@@ -224,7 +226,7 @@ > <legend>Options</legend> > <ol> > <li> >- <div class="hint">This option checks in items to remove them from patron accounts.</br>Items are not marked found, nor do damaged/withdrawn statuses prevent this return, nor are item locations updated. This feature is intended to allow removal of checkouts from patron accounts without affecting fines or other statuses.</div></br> >+ <div class="hint">This option checks in items to remove them from patron accounts.<br />Items are not marked found, nor do damaged/withdrawn statuses prevent this return, nor are item locations updated. This feature is intended to allow removal of checkouts from patron accounts without affecting fines or other statuses.</div><br /> > <div class="subfield_line"> > <label for="mark_items_returned">Check in items:</label> > <select id="mark_items_returned" name="mark_items_returned" class="input_marceditor select2" style="width: 50px"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 9c3d37a916..c73164725f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -57,28 +57,30 @@ > > <h1>Batch record deletion</h1> > [% FOREACH message IN messages %] >+ [% SET message_class = "alert-info" %] > [% IF message.type == 'success' %] >- <div class="alert alert-info"> >+ [% message_class = "alert-info" %] > [% ELSIF message.type == 'warning' %] >- <div class="alert alert-warning"> >+ [% message_class = "alert-warning" %] > [% ELSIF message.type == 'error' %] >- <div class="alert alert-warning" style="margin:auto;"> >- [% END %] >- [% IF message.code == 'biblio_not_exists' %] >- <span>The biblionumber [% message.biblionumber | html %] does not exist in the database.</span> >- [% ELSIF message.code == 'authority_not_exists' %] >- <span>The authority ID [% message.authid | html %] does not exist in the database.</span> >- [% ELSIF message.code == 'cannot_enqueue_job' %] >- <span>Cannot enqueue this job.</span> >- [% ELSIF message.code == 'biblio_not_exists' %] >- <span>Bibliographic record [% message.biblionumber | html %] does not exist in the database.</span> >- [% ELSIF message.code == 'authority_not_exists' %] >- <span>Authority record [% message.authid | html %] does not exist in the database.</span> >+ [% message_class = "alert-warning" %] > [% END %] >+ <div class="alert [% message_class | html %]"> >+ [% IF message.code == 'biblio_not_exists' %] >+ <span>The biblionumber [% message.biblionumber | html %] does not exist in the database.</span> >+ [% ELSIF message.code == 'authority_not_exists' %] >+ <span>The authority ID [% message.authid | html %] does not exist in the database.</span> >+ [% ELSIF message.code == 'cannot_enqueue_job' %] >+ <span>Cannot enqueue this job.</span> >+ [% ELSIF message.code == 'biblio_not_exists' %] >+ <span>Bibliographic record [% message.biblionumber | html %] does not exist in the database.</span> >+ [% ELSIF message.code == 'authority_not_exists' %] >+ <span>Authority record [% message.authid | html %] does not exist in the database.</span> >+ [% END %] > >- [% IF message.error %] >- <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> >- [% END %] >+ [% IF message.error %] >+ <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> >+ [% END %] > </div> > [% END %] > [% IF op == 'form' %] >@@ -156,6 +158,11 @@ > </form> > [% ELSIF op == 'list' %] > [% IF records %] >+ [% SET form_id = "selectauths" %] >+ [% IF recordtype == 'biblio' %] >+ [% SET form_id = "selectrecords" %] >+ [% END %] >+ <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="[% form_id | html %]"> > [% IF recordtype == 'biblio' %] > <div class="btn-toolbar selections-toolbar"> > <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a> >@@ -166,7 +173,6 @@ > </div> > > <div class="page-section"> >- <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectrecords"> > <table id="biblios" class="records"> > <thead> > <tr> >@@ -200,7 +206,6 @@ > | <a id="clearall" href="#"><i class="fa fa-times"></i> Clear all</a> > | <a id="clearlinkedtobiblio" href="#">Clear used authorities</a> > </div> >- <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectauths"> > [% INCLUDE 'csrf-token.inc' %] > <table id="authorities" class="records"> > <thead> >@@ -232,7 +237,6 @@ > <a class="cancel" href="/cgi-bin/koha/tools/batch_delete_records.pl">Cancel</a> > </fieldset> > </form> >- </div> > [% ELSE %] > There are no record IDs defined. > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >index e28319d0c5..9a62c2757c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >@@ -65,12 +65,13 @@ > <div class="alert alert-info"> > > [% FOREACH message IN messages %] >+ <div> > [% IF message.type == 'success' %] >- <div><i class="fa fa-check success"></i> >+ <i class="fa fa-check success"></i> > [% ELSIF message.type == 'warning' %] >- <div><i class="fa-solid fa-triangle-exclamation warn"></i> >+ <i class="fa-solid fa-triangle-exclamation warn"></i> > [% ELSIF message.type == 'error' %] >- <div><i class="fa fa-exclamation error"></i> >+ <i class="fa fa-exclamation error"></i> > [% END %] > [% IF message.error %] > <span>(The error was: [% message.error | html %]. See the Koha logfile for more information).</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 06a770ec8f..6da4d36332 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -59,12 +59,13 @@ > <div class="alert alert-info"> > > [% FOREACH message IN messages %] >+ <div> > [% IF message.type == 'success' %] >- <div><i class="fa fa-check success"></i> >+ <i class="fa fa-check success"></i> > [% ELSIF message.type == 'warning' %] >- <div><i class="fa-solid fa-triangle-exclamation warn"></i> >+ <i class="fa-solid fa-triangle-exclamation warn"></i> > [% ELSIF message.type == 'error' %] >- <div><i class="fa fa-exclamation error"></i> >+ <i class="fa fa-exclamation error"></i> > [% END %] > [% IF message.code == 'no_action_defined_for_the_template' %] > <span>The selected template (id=[% message.mmtid | html %]) does not exist or no action is defined.</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 5ab0f88958..26c45eb6e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -195,21 +195,21 @@ > <p> > <input id="delete" type="radio" name="radio" value="delete" /> > <label for="delete">Permanently delete these patrons</label> >- <div class="hint"> >+ <span class="hint"> > Delete patrons directly from the database. Patron data will not be recoverable. >- </div> >+ </span> > </p> > <p> > <input id="trash" type="radio" name="radio" value="trash" /> > <label for="trash">Move these patrons to the trash</label> >- <div class="hint"> >+ <span class="hint"> > Move patrons to the deleted patrons table. They can be deleted permanently by the <code>cleanup_database</code> script. >- </div> >+ </span> > </p> > <p> > <input id="testrun" type="radio" name="radio" value="testrun" checked="checked" /> > <label for="testrun">Test run: Do not remove any patrons.</label> >- <input type="hidden" name="do_delete" value="[% patrons_to_delete.size | html %]" /></fieldset> >+ <input type="hidden" name="do_delete" value="[% patrons_to_delete.size | html %]" /> > </p> > </fieldset> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index 4a34a6e3cb..4898afa4d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -289,11 +289,11 @@ > <fieldset class="rows"> > <legend> Choose a file </legend> > [% IF ( dbfiles && (dbfiles.size > 0) ) %] >- <ul> >+ <ol> > [% FOREACH dbfile IN dbfiles %] >- <li><input type="radio" name="filename" value="[% dbfile | html %]" />[% dbfile | html %]</li> >+ <li class="radio"><label><input type="radio" name="filename" value="[% dbfile | html %]" />[% dbfile | html %]</label></li> > [% END %] >- </ul> >+ </ol> > [% ELSE %] > <p style="clear:both">Unfortunately, no backups are available.</p> > [% END %] >@@ -316,11 +316,11 @@ > <fieldset class="rows"> > <legend> Choose a file </legend> > [% IF ( conffiles && (conffiles.size > 0) ) %] >- <ul> >+ <ol> > [% FOREACH conffile IN conffiles %] >- <li><input type="radio" name="filename" value="[% conffile | html %]">[% conffile | html %]</input></li> >+ <li class="radio"><label><input type="radio" name="filename" value="[% conffile | html %]" />[% conffile | html %]</label></li> > [% END %] >- </ul> >+ </ol> > [% ELSE %] > <p style="clear:both">Unfortunately, no backups are available.</p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >index 61dd789ed6..48322e04fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -52,10 +52,10 @@ > <main> > [% INCLUDE 'messages.inc' %] > >- <div class="row"> >- <div class="col-sm-6"> > <h1>Import patrons</h1> >+ <div class="row"> > [% IF ( uploadborrowers ) %] >+ <div class="col-sm-6"> > <h2>Import results</h2> > <ul> > <li> >@@ -218,14 +218,13 @@ > </ul> > </div> > [% END %] >+ </div> > [% ELSE %] >+ <div class="col-sm-6"> > <ul> > <li>Select a file to import into the borrowers table</li> > <li>If a card number exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li> > </ul> >- </div> >- <div class="row"> >- <div class="col-sm-6"> > > <form method="post" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data"> > [% INCLUDE 'csrf-token.inc' %] >@@ -391,9 +390,9 @@ > <input type="submit" class="btn btn-primary" value="Import" /> > </fieldset> > </form> >-[% END %] > > </div> >+[% END %] > > <div class="col-sm-6"> > <div class="page-section bg-info"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 8658f7457d..4a8e44f468 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -16,6 +16,14 @@ > [% t("Koha") | html %] > [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >+[% FILTER collapse %] >+ <style> >+ .branchgridrow { >+ display: flex; >+ flex-wrap: wrap; >+ } >+ </style> >+[% END %] > </head> > > <body id="tools_inventory" class="tools"> >@@ -107,9 +115,9 @@ > <legend>Item location filters</legend> > <ol> > <li> >- <label for="branch">Location: </label> >- <input type="radio" name="branch" value="homebranch"> Home library</input> >- <input type="radio" name="branch" value="holdingbranch"> Current library</input> >+ <span class="label">Location: </span> >+ <label><input type="radio" name="branch" value="homebranch" /> Home library</label> >+ <label><input type="radio" name="branch" value="holdingbranch" /> Current library</label> > </li> > > <li> >@@ -160,18 +168,18 @@ > <li> > <label for="maxlocation">...and: </label> > <input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation | html %]" /> >- <li> >- <label for="class_source">Call number classification scheme</label> >- <select name="class_source" id="class_source"> >- [% FOREACH class_source IN class_sources %] >- [% IF class_source.cn_source == pref_class %] >- <option value="[% class_source.cn_source | html %]" selected="selected">[% class_source.description | html %] (default)</option> >- [% ELSE %] >- <option value="[% class_source.cn_source | html %]">[% class_source.description | html %]</option> >- [% END %] >+ </li> >+ <li> >+ <label for="class_source">Call number classification scheme</label> >+ <select name="class_source" id="class_source"> >+ [% FOREACH class_source IN class_sources %] >+ [% IF class_source.cn_source == pref_class %] >+ <option value="[% class_source.cn_source | html %]" selected="selected">[% class_source.description | html %] (default)</option> >+ [% ELSE %] >+ <option value="[% class_source.cn_source | html %]">[% class_source.description | html %]</option> > [% END %] >- </select> >- </li> >+ [% END %] >+ </select> > </li> > </ol> > </fieldset> >@@ -227,21 +235,23 @@ > </li> > <li> > <label>Item types: </label> >- <div class="branchselector"> >- <p><a href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknoneitemtypes"> <i class="fa fa-times"></i> Clear all</a></p> >- <div class="branchgridrow"> >- [% FOREACH itemtype IN itemtypes %] >- <div class="branchgriditem"> >- <input id="itemtype-[% itemtype.itemtype | html %]" class="branch_select" type="checkbox" name="itemtype-[% itemtype.itemtype | html %]" value="[% itemtype.itemtype | html %]" /> >- <label for="itemtype-[% itemtype.itemtype | html %]">[% itemtype.description | html %]</label> >+ <div class="row"> >+ <div class="col-md-9"> >+ <div class="branchselector"> >+ <p><a href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknoneitemtypes"> <i class="fa fa-times"></i> Clear all</a></p> >+ <div class="branchgridrow"> >+ <!-- prettier-ignore-start --> >+ [% FOREACH itemtype IN itemtypes %] >+ <div class="branchgriditem"> >+ <input id="itemtype-[% itemtype.itemtype | html %]" class="branch_select" type="checkbox" name="itemtype-[% itemtype.itemtype | html %]" value="[% itemtype.itemtype | html %]" /> >+ <label for="itemtype-[% itemtype.itemtype | html %]">[% itemtype.description | html %]</label> >+ </div> >+ [% END %] >+ <!-- prettier-ignore-end --> > </div> >- [% IF loop.count() % 4 == 0 && !loop.last() %] >- </div> >- <div class="branchgridrow"> >- [% END %] >- [% END %] >- </div> >- </div> >+ </div> >+ </div> <!-- /.col-md-9 --> >+ </div> <!-- /.row --> > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 5cf3ccf1f0..a382b11338 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -124,7 +124,7 @@ > > [% ELSE %] > >- <h1>[% tx("Actions for template '{template_name}'", template_name = template_name ) | html %]</em></h1> >+ <h1>[% tx("Actions for template '{template_name}'", template_name = template_name ) | html %]</h1> > > [% IF ( ActionsLoop ) %] > <div class="page-section"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index f5e6229ef9..a051a420d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -161,8 +161,10 @@ > <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save changes" /></fieldset> > </form> > [% ELSE %] >- <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div> >- <div class="warning">If this is not what you were expecting, go to <a href="../admin/categories.pl">patron categories</p></div> >+ <div class="alert alert-warning"> >+ <p>You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</p> >+ <p>If this is not what you were expecting, go to <a href="/cgi-bin/koha/admin/categories.pl">patron categories</a></p> >+ </div> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index cbe0180dee..49ef032082 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -139,11 +139,10 @@ > <label for="image"> > [% IF ( filetype == 'image' ) %]<input type="radio" id="image" name="filetype" value="image" checked="checked" />[% ELSE %]<input type="radio" id="image" name="filetype" value="image" />[% END %] Image file</label> > </li> >- [% IF ( filetype == 'image' ) %] >- <li id="cardnum"> >- [% ELSE %] >- <li id="cardnum" style="display: none"> >+ [% IF ( filetype != 'image' ) %] >+ [% SET card_class = "d-none" %] > [% END %] >+ <li id="cardnum" class="[% card_class | html %]"> > <label for="cardnumber">Enter patron card number: </label> > <input type="text" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" size="15" /> > <span class="required">Required</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index 5d1108c5a6..e7a89228ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -94,7 +94,7 @@ > </li> > <li> > <label for="text" class="required">Text: </label> >- <textarea name="text" id="text" class="required" required="required" />[% quote.text | html %]</textarea> >+ <textarea name="text" id="text" class="required" required="required">[% quote.text | html %]</textarea> > <span class="required">Required</span> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index b0ee98c3f4..44ea01e92b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -52,13 +52,15 @@ > [% INCLUDE 'messages.inc' %] > > [% FOREACH message IN messages %] >- [% IF message.type == 'success' %] >- <div class="alert alert-info"> >- [% ELSIF message.type == 'warning' %] >- <div class="alert alert-warning"> >- [% ELSIF message.type == 'error' %] >- <div class="alert alert-warning" style="margin:auto;"> >- [% END %] >+ [% SET message_class = "alert-info" %] >+ [% IF message.type == 'success' %] >+ [% message_class = "alert-info" %] >+ [% ELSIF message.type == 'warning' %] >+ [% message_class = "alert-warning" %] >+ [% ELSIF message.type == 'error' %] >+ [% message_class = "alert-warning" %] >+ [% END %] >+ <div class="alert [% message_class | html %]"> > [% IF message.code == 'cannot_enqueue_job' %] > <span>Cannot enqueue this job.</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index 9fd126f44a..10baafe748 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -389,7 +389,7 @@ > <p> [% sritemstotal | html %] items are still attached to this rota, those items will remain at their current stage libraries.</p> > [% END %] > [% END %] >- <p> >+ <div> > <form id="delete_rota_[% rota_id | html %]" method="post" action="/cgi-bin/koha/tools/stockrotation.pl"> > [% INCLUDE 'csrf-token.inc' %] > <input type="hidden" name="op" value="cud-delete_rota" /> >@@ -397,7 +397,7 @@ > <button class="btn btn-default btn-xs approve" type="submit"><i class="fa fa-fw fa-check"></i> Yes</button> > </form> > <a class="btn btn-default btn-xs deny" href="/cgi-bin/koha/tools/stockrotation.pl"><i class="fa fa-fw fa-times"></i> No</a> >- </p> >+ </div> > </div> > [% ELSIF (op == 'confirm_delete_stage') %] > >@@ -411,7 +411,7 @@ > [% END %] > </ul> > [% END %] >- <p> >+ <div> > <form id="delete_stage_[% stage.stage_id | html %]" method="post" action="/cgi-bin/koha/tools/stockrotation.pl"> > [% INCLUDE 'csrf-token.inc' %] > <input type="hidden" name="op" value="cud-delete_stage" /> >@@ -419,7 +419,7 @@ > <button class="btn btn-default btn-xs approve" type="submit"><i class="fa fa-fw fa-check"></i> Yes</button> > </form> > <a class="btn btn-default btn-xs deny" href="?op=manage_stages&rota_id=[% stage.rota.rota_id | uri %]"><i class="fa fa-fw fa-times"></i> No</a> >- </p> >+ </div> > </div> > [% ELSIF (op == 'manage_items') %] > >@@ -514,12 +514,12 @@ > </td> > <td> > [%- FOREACH this_stage IN stages -%] >+ [% SET stage_class = "stage" %] > [%- IF this_stage.stage_id == sritem.stage.stage_id -%] >- <span class="stage highlight_stage"> >- [%- ELSE -%] >- <span class="stage"> >+ [% stage_class = stage_class _ " highlight_stage" %] > [%- END -%] >- [%- Branches.GetName(this_stage.branchcode_id) | html -%] ([%- this_stage.duration | html -%]) >+ <span class="[% stage_class | html %]"> >+ [%- Branches.GetName(this_stage.branchcode_id) | html -%] ([%- this_stage.duration | html -%]) > </span>» > [%- END -%] > [%- IF stages.size > 0 -%] >@@ -530,30 +530,30 @@ > [%- IF stages.size < 2 -%] > <a class="btn btn-default btn-xs" title="Rota has a single stage, advancing will have no effect" disabled> > [%- ELSE -%] >- [%- IF !transfer -%] >- <a id="move_to_next_stage_[% sritem.id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" href="#" data-item_id="[% sritem.id | html %]" data-rota_id="[% rota.id | html %]" date-stage_id="[% sritem.stage.stage_id | html %]" data-action="/cgi-bin/koha/tools/stockrotation.pl" data-method="post" data-op="cud-move_to_next_stage"> >- [%- ELSE -%] >- <a id="move_to_next_stage_[% sritem.id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" href="#" data-item_id="[% sritem.id | html %]" data-rota_id="[% rota.id | html %]" date-stage_id="[% sritem.stage.stage_id | html %]" data-action="/cgi-bin/koha/tools/stockrotation.pl" data-method="post" data-op="cud-move_to_next_stage" title="Item is in transit, it will be directed to new stage when checked in"> >- [%- END -%] >- <i class="fa fa-arrow-right"></i> Move to next stage</a> >+ [% SET button_title = "" %] >+ [% IF transfer %] >+ [% button_title = "Item is in transit, it will be directed to new stage when checked in" %] >+ [% END %] >+ <a id="move_to_next_stage_[% sritem.id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" href="#" data-item_id="[% sritem.id | html %]" data-rota_id="[% rota.id | html %]" date-stage_id="[% sritem.stage.stage_id | html %]" data-action="/cgi-bin/koha/tools/stockrotation.pl" data-method="post" data-op="cud-move_to_next_stage" title="[% button_title | html %]"> >+ <i class="fa fa-arrow-right"></i> Move to next stage</a> > [%- END -%] > > [%- IF !transfer -%] >- <a id="toggle_in_demand_[% sritem.id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" href="#" data-item_id="[% sritem.id | html %]" data-rota_id="[% rota.id | html %]" date-stage_id="[% sritem.stage.stage_id | html %]" data-action="/cgi-bin/koha/tools/stockrotation.pl" data-method="post" data-op="cud-toggle_in_demand" title="Item is in transit, it will be directed to new stage when checked in"> >+ <a id="toggle_in_demand_[% sritem.id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" href="#" data-item_id="[% sritem.id | html %]" data-rota_id="[% rota.id | html %]" date-stage_id="[% sritem.stage.stage_id | html %]" data-action="/cgi-bin/koha/tools/stockrotation.pl" data-method="post" data-op="cud-toggle_in_demand" title="Item is in transit, it will be directed to new stage when checked in"> > [%- IF sritem.indemand -%] >- <i class="fa fa-fire"></i> Remove "In demand"</button> >+ <i class="fa fa-fire"></i> Remove "In demand" > [%- ELSE -%] >- <i class="fa fa-fire"></i> Add "In demand"</button> >+ <i class="fa fa-fire"></i> Add "In demand" > [%- END -%] > </a> > [%- END -%] > > [%- IF !transfer -%] > <a id="remove_item_from_stage_[% item_id | html %]_[% rota.id | html %]" class="btn btn-default btn-xs submit-form-link" action="/cgi-bin/koha/tools/stockrotation.pl" data-op="cud-remove_item_from_stage" data-item_id="[% sritem.id | html %]" data-stage_id="[% sritem.stage.stage_id | html %]" data-rota_id="[% rota.id | html %]" data-method="post" data-confirmation-msg="[% t('Are you sure you wish to remove this item from its rota?') | html %]"> >+ <i class="fa fa-trash-can"></i> Remove from rota</a> > [%- ELSE -%] >- <a class="btn btn-default btn-xs" disabled="disabled"> >+ <a class="btn btn-default btn-xs" disabled="disabled"><i class="fa fa-trash-can"></i> Remove from rota</a> > [%- END -%] >- <i class="fa fa-trash-can"></i>Remove from rota</a> > </td> > </tr> > [% END %] >@@ -640,19 +640,19 @@ > [% IF ( op == 'manage_stages' || op == 'manage_items' ) %] > <div id="menu"> > <ul> >+ [% SET item_class = "" %] > [% IF op == 'manage_stages' %] >- <li class="active"> >- [% ELSE %] >- <li> >+ [% item_class = "active" %] > [% END %] >- <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >- </li> >+ <li class="[% item_class | html %]"> >+ <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >+ </li> >+ [% SET item_class = "" %] > [% IF op == 'manage_items' %] >- <li class="active"> >- [% ELSE %] >- <li> >+ [% item_class = "active" %] > [% END %] >- <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&rota_id=[% rota_id | uri %]">Manage items</a> >+ <li class="[% item_class | html %]"> >+ <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&rota_id=[% rota_id | uri %]">Manage items</a> > </li> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 32949e9e0f..67ff314592 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -178,10 +178,11 @@ > > <div class="row"> > [% IF ( cover_images ) %] >- <div class="col-sm-9"> >+ [% SET column_class = "col-sm-9" %] > [% ELSE %] >- <div class="col-sm-12"> >+ [% SET column_class = "col-sm-12" %] > [% END %] >+ <div class="[% column_class | html %]"> > > <form method="get" action="/cgi-bin/koha/tools/upload-cover-image.pl" id="uploadfile" enctype="multipart/form-data"> > <fieldset class="rows" > >@@ -247,13 +248,14 @@ > [% END %] > <li class="radio"> > <label for="replace"> >- [% IF AllowMultipleCovers == 0 %] >- <input type="checkbox" id="replace" name="replace" value="" disabled="disabled" checked="checked" /> >- Existing covers will be replaced >- [% ELSE %] >- <input type="checkbox" id="replace" name="replace" value="1" /> >- Replace existing covers >- [% END %] >+ [% IF AllowMultipleCovers == 0 %] >+ <input type="checkbox" id="replace" name="replace" value="" disabled="disabled" checked="checked" /> >+ Existing covers will be replaced >+ [% ELSE %] >+ <input type="checkbox" id="replace" name="replace" value="1" /> >+ Replace existing covers >+ [% END %] >+ </label> > </li> > </ol> > </fieldset> >@@ -310,8 +312,6 @@ > var biblionumber = "[% biblionumber | html %]"; > </script> > [% Asset.js("js/upload-images.js") | $raw %] >- >- </script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index e4764e44e1..f28e15a90b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -294,7 +294,11 @@ > [% ELSIF loopro.module == "SYSTEMPREFERENCE" || loopro.module == "REPORTS" || loopro.module == "NEWS" %] > <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div> > <div class="compare_info" id="compare_info[% loopro.action_id | html %]"> >- <label><input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% FOREACH info IN loopro.info.split(' \| ') %][% IF loop.first %][% info | html %][% END %][% END %]" class="compare" /> Compare</label> >+ <!-- prettier-ignore-start --> >+ <label> >+ [% SET split_info = loopro.info.split(' \| ') %] >+ <input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% FOREACH info IN split_info %][% IF loop.first %][% info | html %][% END %][% END %]" class="compare" /> Compare</label> >+ <!-- prettier-ignore-end --> > </div> > [% ELSIF loopro.module == "NOTICES" %] > <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index c46c64ba12..9a7266ad9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -287,33 +287,37 @@ > [% UNLESS ( item_level_itypes ) %] > <th>Item type</th> > [% END %] >+ [% SET sort_class = 'dt-orderable-asc dt-orderable-desc' %] > [% IF sortfield == 'title' %] >- <th class="sorting_[% direction | html %]"> >- [% ELSE %] >- <th class="sorting"> >+ [% sort_class = sort_class _ " dt-ordering-" _ direction %] > [% END %] >+ <th class="[% sort_class | html %]"> > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=title&direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | uri %][% END %]">Title</a> >+ <span class="dt-column-order"></span> > </th> >+ [% SET sort_class = 'dt-orderable-asc dt-orderable-desc' %] > [% IF sortfield == 'author' %] >- <th class="sorting_[% direction | html %]"> >- [% ELSE %] >- <th class="sorting"> >+ [% sort_class = sort_class _ " dt-ordering-" _ direction %] > [% END %] >+ <th class="[% sort_class | html %]"> > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=author&direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | uri %][% END %]">Author</a> >+ <span class="dt-column-order"></span> > </th> >+ [% SET sort_class = 'dt-orderable-asc dt-orderable-desc' %] > [% IF sortfield == 'dateadded' %] >- <th class="sorting_[% direction | html %]"> >- [% ELSE %] >- <th class="sorting"> >+ [% sort_class = sort_class _ " dt-ordering-" _ direction %] > [% END %] >+ <th class="[% sort_class | html %]"> > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=dateadded&direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date added</a> >+ <span class="dt-column-order"></span> > </th> >+ [% SET sort_class = 'dt-orderable-asc dt-orderable-desc' %] > [% IF sortfield == 'itemcallnumber' %] >- <th class="sorting_[% direction | html %]"> >- [% ELSE %] >- <th class="sorting"> >+ [% sort_class = sort_class _ " dt-ordering-" _ direction %] > [% END %] >+ <th class="[% sort_class | html %]"> > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=itemcallnumber&direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | uri %][% END %]">Call number</a> >+ <span class="dt-column-order"></span> > </th> > </tr> > </thead> >@@ -337,7 +341,6 @@ > [% itemsloo.XSLTBloc | $raw %] > [% ELSE %] > [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %] >- </a> > [% END %] > <p class="hold"> > [% IF ( itemsloo.notforloan ) %] >-- >2.39.5
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 38664
:
175488
| 175664