Bug 13618: Deal with span in patron-title

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-08-08 16:13:05 -03:00 committed by Nick Clemens
parent 865c385f71
commit 5a7ee2db08

View file

@ -1,3 +1,4 @@
[%- USE raw -%]
[%- USE Koha -%] [%- USE Koha -%]
[%- USE Branches -%] [%- USE Branches -%]
[%- SET data = {} -%] [%- SET data = {} -%]
@ -29,12 +30,13 @@
[%# Parameter no_html - if 1, the html tags are NOT generated %] [%# Parameter no_html - if 1, the html tags are NOT generated %]
[%- IF data.title %] [%- IF data.title %]
[%- IF no_html %] [%- IF no_html %]
[%- span_start = '' | html %] [%- span_start = '' %]
[%- span_end = '' | html %] [%- span_end = '' %]
[%- ELSE %] [%- ELSE %]
[%- span_start = '<span class="patron-title">' %] [%- span_start = '<span class="patron-title">' %]
[%- span_end = '</span>' | html %] [%- span_end = '</span>' %]
[%- END %] [%- END %]
[% data.title = data.title | html %]
[%- SET data.title = span_start _ data.title _ span_end _ ' ' -%] [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
[%- END -%] [%- END -%]
[%- SET display_patron_name = 1 -%] [%- SET display_patron_name = 1 -%]
@ -57,9 +59,9 @@
[%- IF data.category_type == 'I' -%] [%- IF data.category_type == 'I' -%]
[%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%]
[%- ELSIF invert_name -%] [%- ELSIF invert_name -%]
[% data.title | html %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%] [% data.title | $raw %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%]
[%- ELSE -%] [%- ELSE -%]
[% data.title | html %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%]
[%- END -%] [%- END -%]
[%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%]
[%- ELSIF display_cardnumber -%] [%- ELSIF display_cardnumber -%]