View | Details | Raw Unified | Return to bug 24710
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-3 / +40 lines)
Lines 40-45 Link Here
40
    [% data.title = data.title | html %]
40
    [% data.title = data.title | html %]
41
    [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
41
    [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
42
[%- END -%]
42
[%- END -%]
43
44
[%- IF data.surname %]
45
    [%- IF no_html %]
46
        [%- span_start = '' %]
47
        [%- span_end   = '' %]
48
    [%- ELSE %]
49
        [%- span_start = '<span class="patron-surname">' %]
50
        [%- span_end   = '</span>' %]
51
    [%- END %]
52
    [% data.surname = data.surname | html %]
53
    [%- SET data.surname = span_start _ data.surname _ span_end _ ' ' -%]
54
[%- END -%]
55
56
[%- IF data.firstname %]
57
    [%- IF no_html %]
58
        [%- span_start = '' %]
59
        [%- span_end   = '' %]
60
    [%- ELSE %]
61
        [%- span_start = '<span class="patron-firstname">' %]
62
        [%- span_end   = '</span>' %]
63
    [%- END %]
64
    [% data.firstname = data.firstname | html %]
65
    [%- SET data.firstname = span_start _ data.firstname _ span_end _ ' ' -%]
66
[%- END -%]
67
68
[%- IF data.othernames %]
69
    [%- IF no_html %]
70
        [%- span_start = '' %]
71
        [%- span_end   = '' %]
72
    [%- ELSE %]
73
        [%- span_start = '<span class="patron-othernames">' %]
74
        [%- span_end   = '</span>' %]
75
    [%- END %]
76
    [% data.othernames = data.othernames | html %]
77
    [%- SET data.othernames = span_start _ data.othernames _ span_end _ ' ' -%]
78
[%- END -%]
79
43
[%- SET display_patron_name = 1 -%]
80
[%- SET display_patron_name = 1 -%]
44
[%- SET display_cardnumber  = 1 -%]
81
[%- SET display_cardnumber  = 1 -%]
45
[%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%]
82
[%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%]
Lines 58-68 Link Here
58
[%- END -%]
95
[%- END -%]
59
[%- IF display_patron_name -%]
96
[%- IF display_patron_name -%]
60
    [%- IF data.category_type == 'I' -%]
97
    [%- IF data.category_type == 'I' -%]
61
        [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%]
98
        [%- data.surname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %])[% END -%]
62
    [%- ELSIF invert_name -%]
99
    [%- ELSIF invert_name -%]
63
        [% data.title | $raw %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%]
100
        [% data.title | $raw %][%- data.surname | $raw %], [% data.firstname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %]) [% END -%]
64
    [%- ELSE -%]
101
    [%- ELSE -%]
65
        [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%]
102
        [% data.title | $raw %][%- data.firstname | $raw %] [% IF data.othernames %] ([% data.othernames | $raw %]) [% END %] [% data.surname | $raw -%]
66
    [%- END -%]
103
    [%- END -%]
67
    [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%]
104
    [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%]
68
[%- ELSIF display_cardnumber -%]
105
[%- ELSIF display_cardnumber -%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc (-3 / +2 lines)
Lines 1-8 Link Here
1
[%- IF patron.category.category_type == 'I' -%]
1
[%- IF patron.category.category_type == 'I' -%]
2
    [% patron.surname | html %][% IF patron.othernames %] ([% patron.othernames | html %]) [%- END -%]
2
   <span class="patron-surname">[% patron.surname | html %]</span>[% IF patron.othernames %] <span class="patron-othernames">([% patron.othernames | html %])</span> [%- END -%]
3
[%- ELSE -%]
3
[%- ELSE -%]
4
    [%- IF patron.title -%]
4
    [%- IF patron.title -%]
5
        <span class="patron-title">[% patron.title | html %]</span>
5
        <span class="patron-title">[% patron.title | html %]</span>
6
    [%- END -%]
6
    [%- END -%]
7
    [% patron.firstname | html %] [% patron.surname | html %]
7
    <span class="patron-firstname">[% patron.firstname | html %]</span> <span class="patron-surname">[% patron.surname | html %]</span>
8
[%- END -%]
8
[%- END -%]
9
- 

Return to bug 24710