@@ -, +, @@ for names .patron-firstname {display: none;} .patron-othernames {display:none}; .patron-surname{display:none} .patron-title{display:none} --- .../prog/en/includes/patron-title.inc | 43 ++++++++++++++++++++-- .../bootstrap/en/includes/patron-title.inc | 4 +- 2 files changed, 42 insertions(+), 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -40,6 +40,43 @@ [% data.title = data.title | html %] [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%] [%- END -%] + +[%- IF data.surname %] + [%- IF no_html %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- ELSE %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- END %] + [% data.surname = data.surname | html %] + [%- SET data.surname = span_start _ data.surname _ span_end _ ' ' -%] +[%- END -%] + +[%- IF data.firstname %] + [%- IF no_html %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- ELSE %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- END %] + [% data.firstname = data.firstname | html %] + [%- SET data.firstname = span_start _ data.firstname _ span_end _ ' ' -%] +[%- END -%] + +[%- IF data.othernames %] + [%- IF no_html %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- ELSE %] + [%- span_start = '' %] + [%- span_end = '' %] + [%- END %] + [% data.othernames = data.othernames | html %] + [%- SET data.othernames = span_start _ data.othernames _ span_end _ ' ' -%] +[%- END -%] + [%- SET display_patron_name = 1 -%] [%- SET display_cardnumber = 1 -%] [%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%] @@ -58,11 +95,11 @@ [%- END -%] [%- IF display_patron_name -%] [%- IF data.category_type == 'I' -%] - [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] + [%- data.surname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %])[% END -%] [%- ELSIF invert_name -%] - [% data.title | $raw %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%] + [% data.title | $raw %][%- data.surname | $raw %], [% data.firstname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %]) [% END -%] [%- ELSE -%] - [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] + [% data.title | $raw %][%- data.firstname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %]) [% END %] [% data.surname | $raw -%] [%- END -%] [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] [%- ELSIF display_cardnumber -%] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc +++ a/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.firstname | html %] [% patron.surname | html %] + [% patron.firstname | html %] [% patron.surname | html %] [%- END -%] --