Attachment 149866 Details for Bug 32721 – Bug 32721: (QA follow-up) Add missing imports

[patch] Bug 32721: (QA follow-up) Add missing imports

Bug-32721-QA-follow-up-Add-missing-imports.patch (text/plain), 4.41 KB, created by Matt Blenkinsop on 2023-04-19 10:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2023-04-19 10:46:18 UTC

Size: 4.41 KB

patch

obsolete

>From 0401996a926ec672138e85de66a6e8f58c2ea98a Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>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
>---
> 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 &rsaquo; Administration &rsaquo; 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 &rsaquo; Administration &rsaquo; 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' %]
>     <style>
>         .CodeMirror {
>             border: 1px solid #EEE;
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>index ea3a4aecf6..c89e1d846c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>@@ -40,6 +40,11 @@
>     [% Asset.css("css/sco.css") | $raw %]
> [% END %]
> [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>+[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
>+    <style>
>+        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
>+    </style>
>+[% END %]
> [% IF ( Koha.Preference('SelfCheckInUserCSS') ) %]<style>[% Koha.Preference('SelfCheckInUserCSS') | $raw %]</style>[% END %]
> <script>
>     var Koha = {};
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>index b01c769dad..e8a03af24d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>@@ -10,6 +10,11 @@
> [% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
> [% Asset.css("css/sco.css") | $raw %]
> [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>+[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
>+    <style>
>+        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
>+    </style>
>+[% END %]
> [% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
> <script>
>     function _(s) { return s } // dummy function for gettext
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index a157e86cc6..a76a5f94bf 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -21,6 +21,11 @@
>     [% Asset.css("css/sco.css") | $raw %]
> [% END %]
> [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>+[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
>+    <style>
>+        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
>+    </style>
>+[% END %]
> [% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
> <script>
>     var Koha = {};
>-- 
>2.37.1 (Apple Git-137.1)

Actions: View | Diff | Splinter Review

Attachments on bug 32721: 145731 | 145732 | 145733 | 145734 | 145735 | 145754 | 145759 | 146159 | 146160 | 146161 | 146162 | 146163 | 146164 | 147373 | 149860 | 149861 | 149862 | 149863 | 149864 | 149865 | 149866 | 150713 | 150724 | 150725 | 150726 | 150727 | 150728 | 150729 | 150730 | 150731 | 150732 | 150754 | 150755 | 150756 | 150757 | 150758 | 156157 | 156158 | 156159 | 156160 | 156161 | 156162 | 156163 | 156164 | 157335