From a3ceef8366a10fa158877de9cd4f82b293d16438 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Fri, 24 Feb 2023 17:03:09 +0000 Subject: [PATCH] Bug 32721: (QA follow-up) Add missing imports Missing imports added in three template files Exec flag added to atomic update file Tinymce imports removed A new bug will be created to move codemirror into an inc file at latest version Test plan as before Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 -- koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 5 +++++ koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 5 +++++ koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index e35e16d0a4..2505ecce79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -493,7 +493,6 @@ Libraries › Administration › Koha [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] - [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %] [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %] [% Asset.js( "lib/codemirror/css.min.js" ) | $raw %] [% Asset.js( "lib/codemirror/javascript.min.js" ) | $raw %] @@ -509,7 +508,6 @@ Libraries › Administration › Koha [% Asset.js( "lib/codemirror/css-lint.min.js" ) | $raw %] [% Asset.js( "lib/codemirror/yaml-lint.min.js" ) | $raw %] [% Asset.css("lib/codemirror/codemirror.css") | $raw %] - [% INCLUDE 'str/tinymce_i18n.inc' %] [% END %] +[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %] + +[% END %] [% IF ( Koha.Preference('SelfCheckInUserCSS') ) %][% END %]