From 512c5f0c0d64cd4cf7a50c006416b42856202d41 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 7 Dec 2017 17:20:48 +0000 Subject: [PATCH] Bug 19761: Move template JavaScript to the footer: Serials, part 2 This patch modifies more staff client serials 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 the modified templates: All button controls, DataTables functionality, tabs, etc. - Serials -> Subscription detail -> Edit routing list - Add recipients - Save - "Save and preview routing slip" should trigger preview - In preview popup: Print and Close buttons should work correctly Signed-off-by: Claire Gravely Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../modules/serials/routing-preview-slip.tt | 23 ++++--- .../en/modules/serials/routing-preview.tt | 32 +++++---- .../prog/en/modules/serials/routing.tt | 65 ++++++++++--------- 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index 5019820d47..e04b780479 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -1,15 +1,7 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Routing slip preview [% INCLUDE 'doc-head-close.inc' %] - @@ -17,6 +9,7 @@ .yui-t7, #custom-doc { min-width:0; width:auto; } +
@@ -50,4 +43,16 @@
+[% MACRO jsinclude BLOCK %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt index 7478b111e6..7fb8410b1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -1,20 +1,9 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Preview routing list [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'serials-search.inc' %] @@ -58,4 +47,21 @@ function print_slip(subscriptionid,issue){ [% INCLUDE 'serials-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index b0b32adfde..5ed4c75be8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -1,36 +1,7 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › [% title |html %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %] [% INCLUDE 'doc-head-close.inc' %] - [% INCLUDE 'header.inc' %] @@ -115,4 +86,38 @@ function reorder_item(sid,rid,rank){ [% INCLUDE 'serials-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5