From 13c54426d1bfd1027672c27b50be3ce74a0a7dda 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 | 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' %] Self checkout help › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] - - - -[% 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') ) %][% END %] -[% IF ( SCOUserCSS ) %][% END %] - +[% INCLUDE 'doc-head-close.inc' %] +[% BLOCK cssinclude %] + [% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] + [% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] + [% Asset.css("css/sco.css") | $raw %] +[% END %] [% INCLUDE 'masthead-sco.inc' %] @@ -62,5 +57,8 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] - [% IF ( SCOUserJS ) %][% END %] + [% IF ( Koha.Preference('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 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' %] Self checkout › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] - - -[% IF ( Koha.Preference('OpacFavicon') ) %] - -[% ELSE %] - -[% 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') ) %][% END %] -[% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] - -[% 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') ) %][% END %] + [% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] + [% IF ( bidi ) %] + [% Asset.css("css/sco-rtl.css") | $raw %] + [% ELSE %] + [% Asset.css("css/sco.css") | $raw %] + [% END %] +[% END %] [% 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 %]