From 4b7bbc47be940b777bcd26e15e851afd2bff0621 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 25 Apr 2018 18:07:42 +0000 Subject: [PATCH] Bug 20220: Move template JavaScript to the footer: Holds This patch modifies the holds template so that JavaScript is included in the footer. To test, apply the patch and initiate the process of placing a hold. Throughout the process JavaScript-based interactions should work: Patron autocomplete, datepickers, DataTables, cancel confirmations, etc. Signed-off-by: Claire Gravely --- .../prog/en/modules/reserve/request.tt | 424 +++++++++++---------- 1 file changed, 213 insertions(+), 211 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 91e9e5b..2b435d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -4,6 +4,7 @@ [% USE Branches %] [% USE Categories %] [% USE ItemTypes %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% UNLESS ( multi_hold ) %] Koha › Circulation › Holds › Place a hold on [% title |html %] @@ -12,218 +13,8 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'calendar.inc' %] -[% Asset.js("js/circ-patron-search-results.js") %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'circ-search.inc' %] @@ -921,4 +712,215 @@ function checkMultiHold() { + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/circ-patron-search-results.js") %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.1.4