gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 10950: (follow-up) Change display of pronoun fields 

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Lucas Gass 2022-08-29 22:24:56 +00:00 committed by Tomas Cohen Arazi
parent f09cd88779
commit 7386962012
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -25,7 +25,6 @@
[% 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 %]">
@ -52,6 +51,10 @@
<ul class="patronbriefinfo">
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
[% IF patron.pronouns %]
<li class="patronpronouns">([% patron.pronouns | html %])</li>
[% END %]
[% PROCESS 'display-address-style' %]
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">

9
koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
View File

@ -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 -%]

6
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View File

@ -96,6 +96,11 @@
</div>
<h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1>
[% IF patron.pronouns %]
<div class="patronpronouns">([% patron.pronouns | html %])</div>
[% END %]
<div class="col-sm-6">
<div id="patron-information" class="patroninfo-section">
@ -110,7 +115,6 @@
</div>
[% IF ( patron.othernames ) %]<div>&ldquo;[% patron.othernames | html %]&rdquo;</div>[% END %]
[% IF ( patron.pronouns ) %]<div>&ldquo;[% patron.pronouns | html %]&rdquo;</div>[% END %]
<div class="address">
<ul>