Attachment 132277 Details for Bug 21266 – Bug 21266: (follow-up) Removing duplicate lines and moving code around

[patch] Bug 21266: (follow-up) Removing duplicate lines and moving code around

Bug-21266-follow-up-Removing-duplicate-lines-and-m.patch (text/plain), 5.72 KB, created by Aleisha Amohia on 2022-03-28 03:39:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2022-03-28 03:39:54 UTC

Size: 5.72 KB

patch

obsolete

>From 13c54426d1bfd1027672c27b50be3ce74a0a7dda Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Thu, 7 Feb 2019 22:03:54 +0000
>Subject: [PATCH] Bug 21266: (follow-up) Removing duplicate lines and moving
> code around
>
>Removing duplicates lines from sco-main.tt that are already in
>doc-head-close.inc.
>
>Also moving JS code into the jsinclude block and moving CSS code into
>the cssinclude block.
>
>Same fixes applied to sco/help.tt
>
>Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>
>---
> .../opac-tmpl/bootstrap/en/modules/sco/help.tt     | 22 +++++------
> .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 45 ++++++++--------------
> 2 files changed, 27 insertions(+), 40 deletions(-)
>
>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 90614bde2d2..8cac2c45caf 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>@@ -4,17 +4,12 @@
> [% USE KohaDates %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Self checkout help &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
>-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<meta name="generator" content="Koha [% Version | html %]" /> 
>-<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon')  ) %][% Koha.Preference('OpacFavicon') | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>-[% Asset.css("lib/jquery/jquery-ui-1.12.1.css") | $raw %]
>-[% 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 ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
>-<script>
>-    function _(s) { return s } // dummy function for gettext
>-</script>
>+[% INCLUDE 'doc-head-close.inc' %]
>+[% BLOCK cssinclude %]
>+    [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>+    [% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
>+    [% Asset.css("css/sco.css") | $raw %]
>+[% END %]
> </head>
> <body id="sco_help" class="sco">
>     [% INCLUDE 'masthead-sco.inc' %]
>@@ -62,5 +57,8 @@
> 
> [% INCLUDE 'opac-bottom.inc' %]
> [% BLOCK jsinclude %]
>-    [% IF ( SCOUserJS ) %]<script>[% SCOUserJS | $raw %]</script>[% END %]
>+    [% IF ( Koha.Preference('SCOUserJS') ) %]<script>[% Koha.Preference('SCOUserJS') | $raw %]</script>[% END %]
>+    <script>
>+        function _(s) { return s } // dummy function for gettext
>+    </script>
> [% END %]
>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 993deb964d1..b317e21237f 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
>@@ -1,4 +1,4 @@
>-    [% USE raw %]
>+[% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>@@ -7,34 +7,16 @@
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
>-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<meta name="generator" content="Koha [% Version | html %]" /> 
>-[% IF ( Koha.Preference('OpacFavicon') ) %]
>-<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') | url %]" type="image/x-icon" />
>-[% ELSE %]
>-<link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
>-[% END %]
>-[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
>-[% IF ( bidi ) %]
>-    [% Asset.css("lib/jquery/jquery-ui-rtl-1.12.1.min.css") | $raw %]
>-    [% Asset.css("css/sco-rtl.css") | $raw %]
>-[% ELSE %]
>-    [% Asset.css("lib/jquery/jquery-ui-1.12.1.css") | $raw %]
>-    [% Asset.css("css/sco.css") | $raw %]
>-[% END %]
>-[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>-[% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
>-<script>
>-    var Koha = {};
>-    function _(s) { return s } // dummy function for gettext
>-</script>
>-[% IF lang && lang != 'en' %]
>-    [% Asset.js(lang _ '/js/locale_data.js') | $raw %]
>-[% END %]
>-[% Asset.js('js/Gettext.js') | $raw %]
>-[% Asset.js('js/i18n.js') | $raw %]
> [% INCLUDE 'doc-head-close.inc' %]
>-[% BLOCK cssinclude %][% END %]
>+[% BLOCK cssinclude %]
>+    [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>+    [% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
>+    [% IF ( bidi ) %]
>+        [% Asset.css("css/sco-rtl.css") | $raw %]
>+    [% ELSE %]
>+        [% Asset.css("css/sco.css") | $raw %]
>+    [% END %]
>+[% END %]
> </head>
> <body id="sco_main" class="sco" onload="dofocus();" onunload="mungeHistory();">
>     [% INCLUDE 'masthead-sco.inc' %]
>@@ -448,7 +430,14 @@
> [% INCLUDE 'opac-bottom.inc' %]
> [% BLOCK jsinclude %]
>     [% INCLUDE 'datatables.inc' %]
>+    [% IF lang && lang != 'en' %]
>+        [% Asset.js(lang _ '/js/locale_data.js') | $raw %]
>+    [% END %]
>+    [% Asset.js('js/Gettext.js') | $raw %]
>+    [% Asset.js('js/i18n.js') | $raw %]
>     <script>
>+        function _(s) { return s } // dummy function for gettext
>+
>         function mungeHistory() {
>             // prevent back button from allowing form resubmission
>             if (history && history.pushState) {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21266: 78103 | 84860 | 85201 | 85202 | 117217 | 117218 | 117219 | 132276 | 132277 | 132278