Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 12663: (QA followup)

Browse source 
Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of'
    i.e. Remove IF/ELSE and use 2 IF

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2016-03-31 19:48:23 +00:00 committed by Brendan Gallagher
parent e476be5568
commit 6dce6f171d
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
View file

@ -37,13 +37,12 @@
[% IF ( bidi ) %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />
[% END %]
[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
[% IF SCO_login %]
[% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %]
[% IF SCOUserCSS %]
<style type="text/css">[% SCOUserCSS %]</style>
[% END %]
[% ELSE %]
[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
[% END %]
<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
[% PROCESS cssinclude %]

15
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
View file

@ -266,6 +266,13 @@ $(document).ready(function() {
});
</script>
[% PROCESS jsinclude %]
[% IF ( OPACUserJS ) %]
<script type="text/javascript">
//<![CDATA[
[% OPACUserJS %]
//]]>
</script>
[% END %]
[% IF SCO_login %]
[% SET SCOUserJS = Koha.Preference('SCOUserJS') %]
[% IF ( SCOUserJS ) %]
@ -275,14 +282,6 @@ $(document).ready(function() {
//]]>
</script>
[% END %]
[% ELSE %]
[% IF ( OPACUserJS ) %]
<script type="text/javascript">
//<![CDATA[
[% OPACUserJS %]
//]]>
</script>
[% END %]
[% END %]
</body>
</html>