@@ -, +, @@
Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of'
i.e. Remove IF/ELSE and use 2 IF
---
.../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(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ a/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 %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ a/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 %]