From 513aa79a5bf1f3db49288ebaafe372fc8ff7b7ab Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 5 Oct 2018 14:43:41 +0100 Subject: [PATCH] Bug 11897: (QA follow-up) Fixes for JS12 Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../en/modules/catalogue/stockrotation.tt | 18 +++++---- .../prog/en/modules/tools/stockrotation.tt | 37 +++++++++++-------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index b12e7bec7b..88c7ed2ef4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -1,17 +1,12 @@ [% USE raw %] [% USE Koha %] +[% USE Asset %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › Stock rotation details for [% biblio.title | html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'browser-strings.inc' %] -[% Asset.js("js/browser.js") | $raw %] - [% USE KohaDates %] @@ -169,4 +164,13 @@ [% INCLUDE 'biblio-view-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% Asset.js("js/browser.js") | $raw %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt index 173d8641fc..25f9b38f53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -1,27 +1,13 @@ [% USE raw %] +[% USE Asset %] [% USE Koha %] [% USE Branches %] [% USE KohaDates %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Stock rotation [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") | $raw %] -[% INCLUDE 'datatables.inc' %] -[% Asset.js("js/pages/stockrotation.js") | $raw %] - @@ -508,4 +494,23 @@ + +[% MACRO jsinclude BLOCK %] + [% Asset.js("js/tools-menu.js") | $raw %] + [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/pages/stockrotation.js") | $raw %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5