Attachment 111187 Details for Bug 26534 – Bug 26534: (follow-up) Only center when using patronimages

[patch] Bug 26534: (follow-up) Only center when using patronimages

Bug-26534-follow-up-Only-center-when-using-patroni.patch (text/plain), 3.21 KB, created by David Nind on 2020-10-03 00:28:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2020-10-03 00:28:12 UTC

Size: 3.21 KB

patch

obsolete

>From 7d93c76b721ce950cd1647cc17024663fe835627 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 25 Sep 2020 12:48:30 +0100
>Subject: [PATCH] Bug 26534: (follow-up) Only center when using patronimages
>
>I felt the change to always center the user title worked well when
>patronimages was enabled, but not so well when it was not (it looked
>strange without a background for non-staff users).
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../intranet-tmpl/prog/css/src/staff-global.scss   |  3 +-
> .../intranet-tmpl/prog/en/includes/circ-menu.inc   | 33 +++++++++++++---------
> 2 files changed, 21 insertions(+), 15 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 26d064a3c0..ff925b126b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -1380,11 +1380,10 @@ dd {
>     margin-top: -.5em;
> 
>     h5 {
>-        text-align: center;
>         border-right: 1px solid #B9D8D9;
>         margin-bottom: 0;
>         padding-bottom: .5em;
>-        padding-left: -.5em;
>+        padding-left: 0em;
>         padding-top: .5em;
> 
>         &:empty {
>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 ec23e4f3b4..ef7e5d0ce0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -5,20 +5,14 @@
> [% SET patrongrade = ( patron.has_permission({ 'catalogue' => 1 }) ) ? 'staffgrade' : 'normalgrade' %]
> <div class="patroninfo [% patrongrade | html %]">
> 
>-<h5>
>-    [% IF ( patrongrade == 'staffgrade' ) %]
>-        <i class="fa fa-shield" title="Staff patron"></i>
>-    [% END %]
>-    [% INCLUDE 'patron-title.inc' %]
>-</h5>
>-
>-[% IF Koha.Preference('showLastPatron') %]
>-    <input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber | html %]">
>-    <input type="hidden" id="hiddenborrowername" value="[% patron.surname | html %] [% patron.firstname | html %]">
>-    <input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber | html %]">
>-[% END %]
>-
> [% IF ( patronimages ) %]
>+    <h5 class="text-center">
>+        [% IF ( patrongrade == 'staffgrade' ) %]
>+            <i class="fa fa-shield fa-fw" title="Staff patron"></i>
>+        [% END %]
>+        [% INCLUDE 'patron-title.inc' %]
>+    </h5>
>+
>     <div>
>         <div class="patronimage-container">
>             [% IF ( patron.image ) %]
>@@ -34,6 +28,19 @@
>             [% END %]
>         </div>
>     </div>
>+[% ELSE %]
>+    <h5>
>+        [% IF ( patrongrade == 'staffgrade' ) %]
>+            <i class="fa fa-shield fa-fw" title="Staff patron"></i>
>+        [% END %]
>+        [% INCLUDE 'patron-title.inc' %]
>+    </h5>
>+[% END %]
>+
>+[% IF Koha.Preference('showLastPatron') %]
>+    <input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber | html %]">
>+    <input type="hidden" id="hiddenborrowername" value="[% patron.surname | html %] [% patron.firstname | html %]">
>+    <input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber | html %]">
> [% END %]
> 
> <ul class="patronbriefinfo">
>-- 
>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