From 75f9cdf2fee16240a1def099bdf6d28c51e0cf10 Mon Sep 17 00:00:00 2001 From: Andrew Fuerste Henry Date: Tue, 10 Dec 2024 18:28:17 +0000 Subject: [PATCH] Bug 30568: Add classes to component name parts in intranet to test: 1 - have a patron with all name parts 2 - load pages with a variety of name displays, confirm lack of classes 3 - apply patch 4 - reload pages from step 2, confirm there are now classes *except for where the name is called with no_html, like a page title Signed-off-by: Lucas Gass --- .../prog/en/includes/patron-title.inc | 49 +++++++++++++++++-- .../bootstrap/en/includes/patron-title.inc | 4 +- 2 files changed, 47 insertions(+), 6 deletions(-) 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 e25bc030414..4384afd73b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -61,13 +61,54 @@ [%- END -%] [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] [%- IF link_to == 'circulation_reserves' -%] - [%- PROCESS display_patron_name -%] + [%- ELSIF link_to == 'circulation_recalls' -%] - [%- PROCESS display_patron_name -%] + [%- ELSIF link_to == 'members_pay' -%] - [%- PROCESS display_patron_name -%] + [%- ELSE -%] - [%- PROCESS display_patron_name -%] + + [%- END -%] +[%- END -%] +[%- IF display_patron_name -%] + [%- IF no_html -%] + [%- IF data.category_type == 'I' -%] + [%- data.surname | html -%] + [%- IF data.othernames -%]([%- data.othernames | html -%])[%- END -%] + [%- ELSIF invert_name -%] + [%- data.title | $raw -%][%- data.surname | html -%][%- IF ( data.preferred_name ) -%], [% data.preferred_name | html -%][%- END -%][%- IF data.middle_name -%][% data.middle_name | html -%][%- END -%][%- IF data.othernames -%]([%- data.othernames | html -%])[%- END -%] + [%- ELSE -%] + [%- data.title | $raw -%][%- data.preferred_name | 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 -%] + [%- ELSE -%] + [%- IF data.category_type == 'I' -%] + [%- data.surname | html -%] [%- IF data.othernames -%]([%- data.othernames | html -%])[%- END -%] + [%- ELSIF invert_name -%] + [%- data.title | $raw -%][%- data.surname | html -%][%- IF ( data.preferred_name ) -%] + , [% data.preferred_name | html -%] + [%- END -%][%- IF data.middle_name -%][% data.middle_name | html -%][%- END -%][%- IF data.othernames -%] + ([%- data.othernames | html -%]) + [%- END -%] + [%- ELSE -%] + [%- data.title | $raw -%][%- data.preferred_name | 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 -%] + [%- END -%] +[%- ELSIF display_cardnumber -%] + [%- IF no_html -%] + [%- IF data.cardnumber -%] + [%# FIXME Cardnumber should always be defined, right? -%] + [%- data.cardnumber | html -%] + [%- END -%] + [%- ELSE -%] + [%- IF data.cardnumber -%] + [%# FIXME Cardnumber should always be defined, right? -%] + [%- data.cardnumber | html -%] + [%- END -%] [%- END -%] [%- ELSE -%] [%- PROCESS display_patron_name -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc index c506504e6fe..66ca272c675 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc @@ -1,8 +1,8 @@ [%- IF patron.category.category_type == 'I' -%] - [% patron.surname | html %][% IF patron.othernames %] ([% patron.othernames | html %]) [%- END -%] + [% patron.surname | html %][% IF patron.othernames %]([% patron.othernames | html %])[%- END -%] [%- ELSE -%] [%- IF patron.title -%] [% patron.title | html %] [%- END -%] - [% patron.preferred_name | html %] [% patron.middle_name | html %] [% patron.surname | html %] + [% patron.preferred_name | html %] [% patron.middle_name | html %] [% patron.surname | html %] [%- END -%] -- 2.39.5