From dae6f1e9f02c87bb610128a0ed786170c94512f4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Jul 2019 13:51:24 +0000 Subject: [PATCH] Bug 23078: (follow-up) Update self checkout help page This patch takes care of some preference instances I missed in the self checkout module's help page. It also removes some obsolete lines from Auth.pm. To test, apply the patch and re-test based on the previous test plan. Also test in the self-checkout module by logging into self checkout and clicking the "Help" link in the upper right of the screen. The settings of the following preferences should be shown correctly: - OpacFavicon - OPACUserCSS Signed-off-by: frederik chenier Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit b5588958981a24c25536afff0b2091506bf7f92b) Signed-off-by: Fridolin Somers (cherry picked from commit bb6e73c5babc0d5566a6be77a98e621082eb8bd4) Signed-off-by: Lucas Gass --- C4/Auth.pm | 2 -- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index c7f9d352d0..85c7144f26 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1231,8 +1231,6 @@ sub checkauth { my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt'; my $template = C4::Templates::gettemplate( $template_name, $type, $query ); $template->param( - OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"), - opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"), login => 1, INPUTS => \@inputs, script_name => get_script_name(), 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 185a201aca..013d322033 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt @@ -1,15 +1,16 @@ [% USE raw %] +[% USE Koha %] [% USE Asset %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] › Self checkout help - + [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %] [% Asset.css("lib/jquery/jquery-ui.css") | $raw %] [% Asset.css("css/sco.css") | $raw %] -[% IF ( OPACUserCSS ) %][% END %] +[% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] [% IF ( SCOUserCSS ) %][% END %]