From fead6412e5e1fc1de346b3235b6aba1b19d34a6c Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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). --- .../prog/css/src/staff-global.scss | 3 +- .../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 b5285b7907..ce078f28ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1381,11 +1381,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' %]
-
- [% IF ( patrongrade == 'staffgrade' ) %] - - [% END %] - [% INCLUDE 'patron-title.inc' %] -
- -[% IF Koha.Preference('showLastPatron') %] - - - -[% END %] - [% IF ( patronimages ) %] +
+ [% IF ( patrongrade == 'staffgrade' ) %] + + [% END %] + [% INCLUDE 'patron-title.inc' %] +
+
[% IF ( patron.image ) %] @@ -34,6 +28,19 @@ [% END %]
+[% ELSE %] +
+ [% IF ( patrongrade == 'staffgrade' ) %] + + [% END %] + [% INCLUDE 'patron-title.inc' %] +
+[% END %] + +[% IF Koha.Preference('showLastPatron') %] + + + [% END %]