From fe11c93b3043637da410c1a2b5ec4f28c91f0b81 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 --- .../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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] › Self checkout help - - - - [% 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 ) %][% END %] -[% IF ( SCOUserCSS ) %][% END %] - - -[% Asset.js("lib/modernizr.min.js") | $raw %] +[% INCLUDE 'doc-head-close.inc' %] +[% BLOCK cssinclude %] + [% IF ( OPACUserCSS ) %][% END %] + [% IF ( SCOUserCSS ) %][% END %] + [% Asset.css("css/sco.css") | $raw %] +[% END %] [% INCLUDE 'masthead-sco.inc' %] @@ -63,5 +54,8 @@ The Submit button only needs to be clicked if you enter the barcode manually.

+ function _(s) { return s } // dummy function for gettext + [% IF ( SCOUserJS ) %][% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] › Self checkout - - - -[% 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') ) %][% END %] -[% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] - - -[% Asset.js("lib/modernizr.min.js") | $raw %] [% INCLUDE 'doc-head-close.inc' %] -[% BLOCK cssinclude %][% END %] +[% BLOCK cssinclude %] + [% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] + [% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] + [% Asset.css("css/sco.css") | $raw %] +[% END %] [% INCLUDE 'masthead-sco.inc' %] @@ -347,6 +336,8 @@ [% BLOCK jsinclude %] [% INCLUDE 'datatables.inc' %]