Attachment 111651 Details for Bug 26534 – Bug 26534: Replace 'grade' by 'is-patron' and 'patron-type'

[patch] Bug 26534: Replace 'grade' by 'is-patron' and 'patron-type'

Bug-26534-Replace-grade-by-is-patron-and-patron-ty.patch (text/plain), 2.25 KB, created by Katrin Fischer on 2020-10-14 22:18:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-14 22:18:06 UTC

Size: 2.25 KB

patch

obsolete

>From b1789dceb844bda57d11804a89372b17e27a4c94 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Wed, 30 Sep 2020 10:07:26 +0200
>Subject: [PATCH] Bug 26534: Replace 'grade' by 'is-patron' and 'patron-type'
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 9 +++++----
> 2 files changed, 6 insertions(+), 5 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 60cf510a5f..a698ec9bf9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -1414,7 +1414,7 @@ dd {
>         width: 100%;
>     }
> 
>-    &.staffgrade {
>+    &.is-staff {
>         h5 {
>             background-color: #EEE;
>         }
>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 ef7e5d0ce0..e57e46c4f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -2,12 +2,13 @@
> [% USE KohaDates %]
> [% PROCESS 'member-display-address-style.inc' %]
> [% IF ( patron.borrowernumber ) %]
>-[% SET patrongrade = ( patron.has_permission({ 'catalogue' => 1 }) ) ? 'staffgrade' : 'normalgrade' %]
>-<div class="patroninfo [% patrongrade | html %]">
>+[% SET patron_is_staff = patron.has_permission({ 'catalogue' => 1 }) %]
>+[% SET patron_type_class = patron_is_staff ? 'is-staff' : 'is-not-staff' %]
>+<div class="patroninfo [% patron_type_class | html %]">
> 
> [% IF ( patronimages ) %]
>     <h5 class="text-center">
>-        [% IF ( patrongrade == 'staffgrade' ) %]
>+        [% IF ( patron_is_staff ) %]
>             <i class="fa fa-shield fa-fw" title="Staff patron"></i>
>         [% END %]
>         [% INCLUDE 'patron-title.inc' %]
>@@ -30,7 +31,7 @@
>     </div>
> [% ELSE %]
>     <h5>
>-        [% IF ( patrongrade == 'staffgrade' ) %]
>+        [% IF ( patron_is_staff ) %]
>             <i class="fa fa-shield fa-fw" title="Staff patron"></i>
>         [% END %]
>         [% INCLUDE 'patron-title.inc' %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26534: 110717 | 110718 | 110738 | 110739 | 110749 | 110750 | 110753 | 110754 | 110960 | 110972 | 110995 | 111185 | 111186 | 111187 | 111188 | 111189 | 111648 | 111649 | 111650 | 111651 | 111652 | 111685