From 7386962012c9f593e09eddc333361a9ea808c469 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 29 Aug 2022 22:24:56 +0000 Subject: [PATCH] Bug 10950: (follow-up) Change display of pronoun fields Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 5 ++++- .../intranet-tmpl/prog/en/includes/patron-title.inc | 9 +++------ .../intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++++- 3 files changed, 12 insertions(+), 8 deletions(-) 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 926008ed94..be02b213ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -25,7 +25,6 @@ [% END %] [% INCLUDE 'patron-title.inc' %] - [% IF Koha.Preference('showLastPatron') %] @@ -52,6 +51,10 @@
    [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] + [% IF patron.pronouns %] +
  • ([% patron.pronouns | html %])
  • + [% END %] + [% PROCESS 'display-address-style' %] [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index 59f4ff489d..d0a3267cf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -6,7 +6,6 @@ [%- SET data.category_type = patron.category.category_type -%] [%- SET data.surname = patron.surname -%] [%- SET data.othernames = patron.othernames -%] - [%- SET data.pronouns = patron.pronouns -%] [%- SET data.firstname = patron.firstname -%] [%- SET data.middle_name = patron.middle_name -%] [%- SET data.cardnumber = patron.cardnumber -%] @@ -16,7 +15,6 @@ [%- SET data.category_type = borrower.category_type -%] [%- SET data.surname = borrower.surname -%] [%- SET data.othernames = borrower.othernames -%] - [%- SET data.pronouns = borrower.pronouns -%] [%- SET data.firstname = borrower.firstname -%] [%- SET data.middle_name = borrower.middle_name -%] [%- SET data.cardnumber = borrower.cardnumber -%] @@ -26,7 +24,6 @@ [%- SET data.category_type = category_type -%] [%- SET data.surname = surname -%] [%- SET data.othernames = othernames -%] - [%- SET data.othernames = pronouns -%] [%- SET data.firstname = firstname -%] [%- SET data.middle_name = middle_name -%] [%- SET data.cardnumber = cardnumber -%] @@ -67,11 +64,11 @@ [%- END -%] [%- IF display_patron_name -%] [%- IF data.category_type == 'I' -%] - [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [% IF data.pronouns %]([% data.pronouns | html %])[% END %] + [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [%- ELSIF invert_name -%] - [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%][% IF data.pronouns %]([% data.pronouns | html %])[% END %] + [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] [%- ELSE -%] - [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%][% IF data.pronouns %]([% data.pronouns | html %])[% END %] + [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] [%- END -%] [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] [%- ELSIF display_cardnumber -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 9092166116..791693195d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -96,6 +96,11 @@

    [% INCLUDE 'patron-title.inc' no_html = 1 %]

    + + [% IF patron.pronouns %] +
    ([% patron.pronouns | html %])
    + [% END %] +
    @@ -110,7 +115,6 @@
    [% IF ( patron.othernames ) %]
    “[% patron.othernames | html %]”
    [% END %] - [% IF ( patron.pronouns ) %]
    “[% patron.pronouns | html %]”
    [% END %]
      -- 2.39.5