Bugzilla – Attachment 49745 Details for
Bug 12663
SCOUserCSS and SCOUserJS ignored on selfcheck login page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12663: (QA followup)
Bug-12663-QA-followup.patch (text/plain), 2.38 KB, created by
Nick Clemens (kidclamp)
on 2016-03-31 19:50:15 UTC
(
hide
)
Description:
Bug 12663: (QA followup)
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2016-03-31 19:50:15 UTC
Size:
2.38 KB
patch
obsolete
>From 01082168a31faaeecccb2b586eab3539a2b60265 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 31 Mar 2016 19:48:23 +0000 >Subject: [PATCH] Bug 12663: (QA followup) > > 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(-) > >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 ) %] > <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 %] >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() { > }); > </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> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12663
:
46736
|
47270
|
47317
|
47318
|
47319
|
48831
|
49595
|
49602
|
49745
|
49864
|
49865
|
49879
|
49880