From a52b0f596f5890c147992120edd6f0227073a571 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 15 Nov 2017 14:13:46 +0000 Subject: [PATCH] Bug 19627: Move patron clubs templates JS to the footer This patch modifies the staff client's patron clubs templates 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 page: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol Signed-off-by: Claire Gravely Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../prog/en/modules/clubs/club-enrollments.tt | 34 ++--- .../prog/en/modules/clubs/clubs-add-modify.tt | 6 +- .../prog/en/modules/clubs/clubs.tt | 121 +++++++++--------- 3 files changed, 83 insertions(+), 78 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index 94e7148f6e..daf07d05b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -1,27 +1,11 @@ [% USE KohaDates %] [% USE Branches %] [% USE Koha %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Patron clubs › Club enrollments [% INCLUDE 'doc-head-close.inc' %] - -[% INCLUDE 'datatables.inc' %] - - - @@ -64,4 +48,20 @@ + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt index ec76ded89b..3d7da8243a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -2,6 +2,7 @@ [% USE Branches %] [% USE AuthorisedValues %] [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Patron clubs › [% IF club %] @@ -11,7 +12,6 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] @@ -125,4 +125,8 @@ +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'calendar.inc' %] +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 0c96f792cb..318d82137c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -1,71 +1,12 @@ [% USE KohaDates %] [% USE Branches %] [% USE Koha %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Patron clubs [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - - - @@ -278,4 +219,64 @@ +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5