From 8fc5aeda1c6f762ee11e2341b39d7b8370512b1c Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 31 Mar 2016 19:48:23 +0000 Subject: [PATCH] [PASSED QA] Bug 12663: (QA followup) Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of' i.e. Remove IF/ELSE and use 2 IF Signed-off-by: Katrin Fischer --- .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 15 +++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index dc61da0..28dc1d4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -51,13 +51,12 @@ [% IF ( bidi ) %] [% END %] +[% IF ( OPACUserCSS ) %][% END %] [% IF SCO_login %] [% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %] [% IF SCOUserCSS %] [% END %] -[% ELSE %] - [% IF ( OPACUserCSS ) %][% END %] [% END %] [% PROCESS cssinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index aae5c24..9e7a15c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -266,6 +266,13 @@ $(document).ready(function() { }); [% PROCESS jsinclude %] +[% IF ( OPACUserJS ) %] + +[% END %] [% IF SCO_login %] [% SET SCOUserJS = Koha.Preference('SCOUserJS') %] [% IF ( SCOUserJS ) %] @@ -275,14 +282,6 @@ $(document).ready(function() { //]]> [% END %] -[% ELSE %] - [% IF ( OPACUserJS ) %] - - [% END %] [% END %] -- 1.9.1