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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-9 / +11 lines)
Lines 64-81 Link Here
64
    [%- IF display_patron_name -%]
64
    [%- IF display_patron_name -%]
65
        [%- IF data.category_type == 'I' -%]
65
        [%- IF data.category_type == 'I' -%]
66
            [%- WRAPPER maybe_span field_name = 'surname' -%][%- data.surname | html -%][%- END -%]
66
            [%- WRAPPER maybe_span field_name = 'surname' -%][%- data.surname | html -%][%- END -%]
67
            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
67
            [%- IF data.othernames -%]
68
                ([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])
69
            [%- END -%]
68
        [%- ELSIF invert_name -%]
70
        [%- ELSIF invert_name -%]
69
            [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
71
            [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
70
            [%- WRAPPER maybe_span field_name='surname' -%][%- data.surname | html -%][%- END -%]
72
            [%- WRAPPER maybe_span field_name='surname' -%][%- data.surname | html -%][%- END -%]
71
            [%- IF ( data.preferred_name ) -%], [%- WRAPPER maybe_span field_name='preferred_name' -%][% data.preferred_name | html -%][%- END -%][%- END -%]
73
            [%- IF ( data.preferred_name ) -%], [%- WRAPPER maybe_span field_name='preferred_name' -%][% data.preferred_name | html -%][%- END -%][%- END -%]
72
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
74
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
73
            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
75
            [%- IF data.othernames -%]
76
                ([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])
77
            [%- END -%]
74
        [%- ELSE -%]
78
        [%- ELSE -%]
75
            [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
79
            [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
76
            [%- WRAPPER maybe_span field_name='preferred_name' -%][%- data.preferred_name | html %][% END -%]
80
            [%- WRAPPER maybe_span field_name='preferred_name' -%][%- data.preferred_name | html %][% END -%]
77
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
81
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
78
            [%- IF data.othernames -%][%- WRAPPER maybe_span field_name='othernames' -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%][%- END -%]
82
            [%- IF data.othernames -%]
83
                [%- WRAPPER maybe_span field_name='othernames' -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%]
84
            [%- END -%]
79
            [%- WRAPPER maybe_span field_name='surname' -%][% ' ' _ data.surname | html -%][%- END -%]
85
            [%- WRAPPER maybe_span field_name='surname' -%][% ' ' _ data.surname | html -%][%- END -%]
80
        [%- END -%]
86
        [%- END -%]
81
        [%- IF display_cardnumber AND data.cardnumber -%][%- WRAPPER maybe_span field_name='cardnumber' -%][%- ' (' _ data.cardnumber _ ')' | html -%][%- END -%][%- END -%]
87
        [%- IF display_cardnumber AND data.cardnumber -%][%- WRAPPER maybe_span field_name='cardnumber' -%][%- ' (' _ data.cardnumber _ ')' | html -%][%- END -%][%- END -%]
Lines 89-97 Link Here
89
    [%- END -%]
95
    [%- END -%]
90
[% END %]
96
[% END %]
91
[%- BLOCK maybe_span -%]
97
[%- BLOCK maybe_span -%]
92
    [%- IF no_html -%]
98
    [%- # All on one line to prevent unwanted whitespace -%]
93
        [%- content | $raw #filtered before passed in -%]
99
    [%- IF no_html -%][%- content | $raw #filtered before passed in -%][%- ELSE -%]<span class="[% field_name | html %]">[%- content | $raw #filtered before passed in -%]</span>[%- END -%]
94
    [%- ELSE -%]
95
        <span class="[% field_name | html %]">[%- content | $raw #filtered before passed in -%]</span>
96
    [%- END -%]
97
[%- END -%]
100
[%- END -%]
98
- 

Return to bug 41586