From 14dc51472a88796f7bf5579e50174d691e74a28a Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Sat, 28 Nov 2015 11:33:37 -0300 Subject: [PATCH] Bug 11038: Enable use of IntranetUserCSS on staff client login page MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch enable use of IntranetUserCss on staff client login page. To test: 1) Add something to IntranetUserCSS to modify login page, for example #login h1 a { height:30px; } 2) Logout from staff client, no changes on login page. 3) Apply the patch 4) Reload, now logo is cut in half :) Bonus) Login again an try changing image, add #login h1 { background: url(http://example.com/img/other-logo.png) no-repeat top center; } and fix height. Logout and check This also affects 3.20 and perhaps earlier versions. Re-upload to fix examples Works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 11e4c42e05090a25bf9fa03275f708d1f1c4fde7) Signed-off-by: Julian Maurice --- C4/Auth.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 8c6d747da4..8512fd9755 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1229,6 +1229,7 @@ sub checkauth { intranetbookbag => C4::Context->preference("intranetbookbag"), IntranetNav => C4::Context->preference("IntranetNav"), IntranetFavicon => C4::Context->preference("IntranetFavicon"), + IntranetUserCSS => C4::Context->preference("IntranetUserCSS"), IntranetUserJS => C4::Context->preference("IntranetUserJS"), IndependentBranches => C4::Context->preference("IndependentBranches"), AutoLocation => C4::Context->preference("AutoLocation"), 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 73514c274d..3e99a52aac 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 @@ -10,7 +10,6 @@ [% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %][% END %] -[% IF ( IntranetUserCSS ) %][% END %] @@ -23,6 +22,7 @@ [% IF ( login ) %] [% END %] +[% IF ( IntranetUserCSS ) %][% END %] -- 2.39.5