From 1937a3042e4755038eb464f3c325e2306d9cf7f3 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 --- .../prog/en/includes/patron-title.inc | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 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 72d4472a83..569b4c8a45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -66,17 +66,34 @@ [%- END -%] [%- END -%] [%- IF display_patron_name -%] - [%- 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 -%] + [%- 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 -%] - [%- 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 -%] + [%- 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 -%] - [%- IF display_cardnumber AND data.cardnumber -%] ([%- data.cardnumber | html -%])[%- END -%] [%- ELSIF display_cardnumber -%] - [%- IF data.cardnumber -%][%# FIXME Cardnumber should always be defined, right? -%] - [%- data.cardnumber | html -%] + [%- 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 -%] A patron from library [%- Branches.GetName( patron.branchcode ) | html -%] -- 2.39.5