Attachment 91503 Details for Bug 23078 – Bug 23078: (follow-up) Update self checkout help page

[patch] Bug 23078: (follow-up) Update self checkout help page

Bug-23078-follow-up-Update-self-checkout-help-page.patch (text/plain), 3.18 KB, created by Frédérik Chénier on 2019-07-12 18:19:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frédérik Chénier

Created: 2019-07-12 18:19:47 UTC

Size: 3.18 KB

patch

obsolete

>From ffe7949499a48142fa04da60f8263b7acc3d2b83 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <frederik.chenier@inlibro.com>
>---
> 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 ba3c00b5e7..e658c8947c 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -1237,8 +1237,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' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout help</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <meta name="generator" content="Koha [% Version | html %]" /> 
>-<link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon')  ) %][% Koha.Preference('OpacFavicon') | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>  [% 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 ) %]<style>[% OPACUserCSS | $raw %]</style>[% END %]
>+[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
> [% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
> <!--[if lt IE 9]>
>     <script src="[% interface | html %]/[% theme | html %]/lib/respond.min.js"></script>
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 23078: 90460 | 90481 | 90936 | 91349 | 91430 | 91431 | 91503 | 91626 | 91627 | 91654 | 91655