Attachment 156769 Details for Bug 35013 – Bug 35013: Font Awesome icons broken in self checkout and self checkin

[patch] Bug 35013: Font Awesome icons broken in self checkout and self checkin

Bug-35013-Font-Awesome-icons-broken-in-self-checko.patch (text/plain), 3.98 KB, created by David Nind on 2023-10-09 21:04:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-10-09 21:04:05 UTC

Size: 3.98 KB

patch

obsolete

>From 970fa272207fea214935060f165608cd43950a43 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 9 Oct 2023 15:21:30 +0000
>Subject: [PATCH] Bug 35013: Font Awesome icons broken in self checkout and
> self checkin
>
>This patch updates the way Font Awesome icon assets are included on the
>self checkout and self checkin pages. This change should have been made
>during the upgrade to Font Awesome 6 (Bug 32910).
>
>To test, apply the patch and make sure both SelfCheckInModule and
>WebBasedSelfCheck system preferences are enabled.
>
>- Go to the self checkout module (/cgi-bin/koha/sco/sco-main.pl) and log
>  in.
>- Check that Font Awesome icons are working: You should see an
>  information icon by the "Help" link in the header, and a check mark
>  icon in the "Finish" button.
>- Click the help link to confirm that the icon appears there too.
>- Go to the self checkin module (/cgi-bin/koha/sci/sci-main.pl).
>- In the header you should see the information icon by the help link and
>  an icon with the "Log out" link too.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 3 +++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt     | 4 +++-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +++-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>index cc044a6845..50649956c0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>@@ -34,6 +34,9 @@
> [% ELSE %]
>     <link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
> [% END %]
>+[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
> [% IF ( bidi ) %]
>     [% Asset.css("css/sco-rtl.css") | $raw %]
> [% ELSE %]
>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 bc50e98507..eb8a349ee9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>@@ -8,7 +8,9 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <meta name="generator" content="Koha [% Version | html %]" /> 
> <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/font-awesome/css/font-awesome.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
> [% Asset.css("css/sco.css") | $raw %]
> [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
> [% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
>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 003c792402..2b1581f0c7 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
>@@ -14,7 +14,9 @@
> [% ELSE %]
> <link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
> [% END %]
>-[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
>+[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
> [% IF ( bidi ) %]
>     [% Asset.css("css/sco-rtl.css") | $raw %]
> [% ELSE %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35013: 156747 | 156751 | 156761 | 156769