From a06d3d428f7a769fedb57bcac0d04f54cdafdc5c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Jan 2018 16:15:01 +0000 Subject: [PATCH] Bug 19641: (follow-up) Update circulation.tt too This patch makes the same JS-to-footer changes to circulation.tt. Inclusion of this template in this bug is necessary because it includes members-toolbar.inc. To test, apply the patch and clear your browser cache if necessary. - Enter a patron card for checkout - Test any JavaScript-driven actions on the checkout page, for instance: - Select all/clear all controls - Datepicker/timepickers - Datatable sorting, columns configuration - Renewals, check-ins - Patron message interactions, print slip, and other toolbar actions - Checkout exports - Search to hold - Tab loading: Restrictions, Holds, Clubs Signed-off-by: Zoe Bennett Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../prog/en/modules/circ/circulation.tt | 269 +++++++++--------- 1 file changed, 138 insertions(+), 131 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index d47d7037e9..542b5f6642 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -6,6 +6,7 @@ [% USE ItemTypes %] [% USE Price %] [% USE AuthorisedValues %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% SET destination = "circ" %] Koha › Circulation @@ -14,118 +15,9 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] - -[% INCLUDE 'strings.inc' %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'columns_settings.inc' %] - - -[% INCLUDE 'timepicker.inc' %] - - - - - + [% INCLUDE 'header.inc' %] @@ -304,27 +196,6 @@ $(document).ready(function() { [% END %] -[% IF HIGHHOLDS %] - -[% END %] - [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
@@ -1099,4 +970,140 @@ No patron matched [% message | html %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'strings.inc' %] + [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + + + [% INCLUDE 'timepicker.inc' %] + + + + + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5