Attachment 159462 Details for Bug 35131 – Bug 35131: Fix preference description and move barcode to bottom of patroninfo

[patch] Bug 35131: Fix preference description and move barcode to bottom of patroninfo

Bug-35131-Fix-preference-description-and-move-barc.patch (text/plain), 2.97 KB, created by Kyle M Hall (khall) on 2023-12-01 16:37:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-12-01 16:37:35 UTC

Size: 2.97 KB

patch

obsolete

>From 03d2fcce695ec8bed0f3a2248d34ba5d45aee6ec Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 26 Oct 2023 16:54:52 +0000
>Subject: [PATCH] Bug 35131: Fix preference description and move barcode to
> bottom of patroninfo
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss |  2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 10 +++++-----
> .../prog/en/modules/admin/preferences/patrons.pref     |  2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 3ca8eb34256..1a60930e297 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -1271,7 +1271,7 @@ dd {
>     }
> 
>     #patron-barcode {
>-        margin-left: 0.9em;
>+        margin-top: 0.9em;
>     }
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index 5483163620d..bd8ad8e240a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -11,11 +11,6 @@
>     [% patron_type_class = 'is-staff' %]
> [% END %]
> <div class="patroninfo [% patron_type_class | html %]">
>-[% IF patron.cardnumber && Koha.Preference('ShowBarcodeOnPatronRecord') %]
>-    <div id="patron-barcode">
>-        <img src="/cgi-bin/koha/svc/barcode?type=[% Koha.Preference('ShowBarcodeOnPatronRecord') | uri %]&notext=1&height=50&barcode=[% patron.cardnumber | uri %]" alt="[% patron.cardnumber | html %]" />
>-    </div>
>-[% END %]
> [% IF ( patronimages ) %]
>     <h5 class="text-center">
> [% ELSE %]
>@@ -130,6 +125,11 @@
>             <li class="blocker account_locked">Account has been locked</li>
>         [% END %]
>     [% END %]
>+        [% IF patron.cardnumber && Koha.Preference('ShowBarcodeOnPatronRecord') %]
>+            <div id="patron-barcode">
>+                <img src="/cgi-bin/koha/svc/barcode?type=[% Koha.Preference('ShowBarcodeOnPatronRecord') | uri %]&notext=1&height=50&barcode=[% patron.cardnumber | uri %]" alt="[% patron.cardnumber | html %]" />
>+            </div>
>+        [% END %]
>   </ul></div>
> <div id="menu">
> <ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 211c5ed3d9b..805eeebc61d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -153,7 +153,7 @@ Patrons:
>                QRcode: "QRcode"
>                UPCA: "UPCA"
>                UPCE: "UPCE"
>-         - " barcode of the patron record."
>+         - " barcode of the patron's card number in the sidebar of patron-related pages."
> 
>     Membership expiry:
>      -
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35131: 157674 | 157675 | 157676 | 157936 | 158242 | 158243 | 158244 | 159459 | 159460 | 159461 | 159462