Attachment 84860 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), 4.89 KB, created by Aleisha Amohia on 2019-02-07 22:23:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2019-02-07 22:23:38 UTC

Size: 4.89 KB

patch

obsolete

>From 8da1c25e717a1e5dedac07c3bec1e623ff6e74a8 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
>---
> .../opac-tmpl/bootstrap/en/modules/sco/help.tt     | 24 ++++++++--------------
> .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 23 +++++++--------------
> 2 files changed, 16 insertions(+), 31 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 185a201..bc4540a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>@@ -3,21 +3,12 @@
> [% USE KohaDates %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout help</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 ( OpacFavicon  ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>- [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %]
>-[% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
>-[% Asset.css("css/sco.css") | $raw %]
>-[% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS | $raw %]</style>[% END %]
>-[% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
>-
>-<script>
>-    function _(s) { return s } // dummy function for gettext
>-</script>
>-[% Asset.js("lib/modernizr.min.js") | $raw %]
>+[% INCLUDE 'doc-head-close.inc' %]
>+[% BLOCK cssinclude %]
>+    [% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS | $raw %]</style>[% END %]
>+    [% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
>+    [% Asset.css("css/sco.css") | $raw %]
>+[% END %]
> </head>
> <body id="sco_help" class="sco">
> [% INCLUDE 'masthead-sco.inc' %]
>@@ -63,5 +54,8 @@ The Submit button only needs to be clicked if you enter the barcode manually.</p
> 
> [% INCLUDE 'opac-bottom.inc' %]
> [% BLOCK jsinclude %]
>+<script>
>+    function _(s) { return s } // dummy function for gettext
>+</script>
> [% IF ( SCOUserJS ) %]<script>[% SCOUserJS | $raw %]</script>[% END %]
> [% 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 a9faa65..d6e1388 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
>@@ -6,23 +6,12 @@
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </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/bootstrap/css/bootstrap.min.css") | $raw %]
>-[% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
>-[% Asset.css("css/sco.css") | $raw %]
>-[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
>-[% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
>-
>-<script>
>-    function _(s) { return s } // dummy function for gettext
>-</script>
>-[% Asset.js("lib/modernizr.min.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 %]
>+    [% Asset.css("css/sco.css") | $raw %]
>+[% END %]
> </head>
> <body id="sco_main" class="sco" onload="dofocus();" onunload="mungeHistory();">
> [% INCLUDE 'masthead-sco.inc' %]
>@@ -347,6 +336,8 @@
> [% BLOCK jsinclude %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>+        function _(s) { return s } // dummy function for gettext
>+
>         //<![CDATA[
>         function mungeHistory() {
>             // prevent back button from allowing form resubmission
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

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