From 8a231762574ef4c52f012c79c3d6a72238f1b675 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 25 Jun 2018 14:43:29 +0000 Subject: [PATCH] Bug 15326: (follow-up) Move js to footer, use Asset plugin Signed-off-by: Josef Moravec Signed-off-by: Michal Denar Signed-off-by: Michal Denar Rebased-by: Martin Renvoize --- .../prog/en/modules/tools/cmspages.tt | 115 +++++++++--------- 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt index d67bc0f777..d2082ae8a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt @@ -1,66 +1,14 @@ [% USE KohaDates %] [% USE Koha %] +[% USE Asset %] +[% SET footerjs = 1 %] [% SET link_opac_base = Koha.Preference( 'OPACBaseURL' ) %] [% SET link_opac = link_opac_base _ '/cgi-bin/koha/opac-cmspages.pl' %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Pages [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %] - - [% INCLUDE 'header.inc' %] @@ -323,4 +271,61 @@ tinyMCE.init({ [% END %] +[% MACRO jsinclude BLOCK %] +[% Asset.js("lib/tiny_mce/tiny_mce.js") %] + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.20.1