Bugzilla – Attachment 47433 Details for
Bug 13618
Add additional template filter methods and a filter presence test to Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13618: Specific for IntranetUser* and OPACUser* prefs
Bug-13618-Specific-for-IntranetUser-and-OPACUser-p.patch (text/plain), 5.91 KB, created by
Jonathan Druart
on 2016-01-29 09:54:28 UTC
(
hide
)
Description:
Bug 13618: Specific for IntranetUser* and OPACUser* prefs
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-01-29 09:54:28 UTC
Size:
5.91 KB
patch
obsolete
>From 2c8450952430e51ff8eac1e542e6cd0091ab1f81 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 4 Aug 2015 16:08:32 +0100 >Subject: [PATCH] Bug 13618: Specific for IntranetUser* and OPACUser* prefs >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- > 6 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index c31932a..be5433a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -22,7 +22,7 @@ > [% IF ( login ) %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" /> > [% END %] >-[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] >+[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS.raw %]</style>[% END %] > > <!-- koha core js --> > <script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script> >@@ -31,7 +31,7 @@ > [% IF ( IntranetUserJS ) %] > <script type="text/javascript"> > //<![CDATA[ >- [% IntranetUserJS %] >+ [% IntranetUserJS.raw %] > //]]> > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index fabc07b..3fdc66e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -10,12 +10,12 @@ > .noprint { display: none; } > } > </style> >-[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] >+[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS.raw %]</style>[% END %] > [% IF ( IntranetUserJS ) %] > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script> > <script type="text/javascript"> > //<![CDATA[ >- [% IntranetUserJS %] >+ [% IntranetUserJS.raw %] > //]]> > </script> > [% END %] >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 e346689..00d4048 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 >@@ -37,7 +37,7 @@ > [% 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 ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] > <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" /> > [% PROCESS cssinclude %] > <!-- Respond.js brings responsive layout behavior to IE < v.9 --> >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 e9a625d..48bf1a2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -270,7 +270,7 @@ $(document).ready(function() { > [% IF ( OPACUserJS ) %] > <script type="text/javascript"> > //<![CDATA[ >- [% OPACUserJS %] >+ [% OPACUserJS.raw %] > //]]> > </script> > [% END %] >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 3bf2f15..0a42ee3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -7,7 +7,7 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] > [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] > <!--[if lt IE 9]> > <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> >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 925d471..1a494dc 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 >@@ -8,7 +8,7 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] > [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] > <!--[if lt IE 9]> > <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> >-- >2.1.0
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 13618
:
35488
|
35516
|
40480
|
40481
|
40482
|
40483
|
40484
|
40485
|
40487
|
41346
|
41347
|
41348
|
41349
|
41350
|
41351
|
41352
|
41353
|
41354
|
41355
|
41746
|
41747
|
41776
|
42009
|
42054
|
42072
|
42073
|
42075
|
42078
|
42079
|
42087
|
42090
|
42091
|
42092
|
42093
|
42094
|
42095
|
42096
|
42097
|
45141
|
45784
|
45785
|
45788
|
46767
|
46768
|
46769
|
46770
|
46771
|
46772
|
46773
|
46774
|
46775
|
46776
|
46777
|
46778
|
46779
|
46780
|
46781
|
46782
|
46783
|
46784
|
46785
|
46786
|
46787
|
46788
|
46789
|
46790
|
46791
|
46792
|
46793
|
46794
|
46795
|
46796
|
46797
|
46798
|
46799
|
46800
|
46801
|
46802
|
46803
|
46804
|
46805
|
46806
|
46807
|
46808
|
46809
|
46810
|
46811
|
46812
|
46813
|
46814
|
46815
|
46816
|
46817
|
46818
|
46819
|
46820
|
46821
|
46822
|
47425
|
47426
|
47427
|
47428
|
47429
|
47430
|
47431
|
47432
|
47433
|
47434
|
47435
|
47436
|
47437
|
47438
|
47439
|
47440
|
47441
|
47442
|
47443
|
47444
|
47445
|
47446
|
47447
|
47448
|
47449
|
47450
|
47451
|
47452
|
47631
|
59983
|
59984
|
59987
|
77804
|
77805
|
77806
|
77807
|
77808
|
77809
|
77997
|
77998
|
78158
|
78274
|
78415
|
79404
|
79818
|
81183
|
83479
|
83480