From 6b2da53bc1dac0ef7f5db62e77e41ed16fc58be8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 22 Nov 2017 19:33:48 +0000 Subject: [PATCH] Bug 19682: Move JS to the footer: Two patron-related tools This patch modifies two patron-related tools templates in the staff client so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. - Import patrons - Upload patron images Signed-off-by: Claire Gravely Edit for QA: Fixed datepickers on import patron form Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../prog/en/modules/tools/import_borrowers.tt | 25 ++++++---- .../prog/en/modules/tools/picture-upload.tt | 50 +++++++++++-------- 2 files changed, 44 insertions(+), 31 deletions(-) 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 7e8245d010..ae5765a676 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 @@ -1,5 +1,6 @@ [% USE Koha %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Import patrons [% IF ( uploadborrowers ) %]› Results[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -9,20 +10,11 @@ .line_error { width: 100%; } code { background-color: yellow; } - + [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] -[% INCLUDE 'calendar.inc' %] @@ -245,4 +237,17 @@ Alternatively, you can supply dates in ISO format. [% INCLUDE 'tools-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'calendar.inc' %] + + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] 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 958f810a7c..fa0db25e97 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 @@ -1,28 +1,9 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Upload patron images [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] @@ -157,4 +138,31 @@ [% INCLUDE 'tools-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5