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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-20 / +21 lines)
Lines 34-51 Link Here
34
    [%- SET data.title          = title -%]
34
    [%- SET data.title          = title -%]
35
[%- END -%]
35
[%- END -%]
36
[%# Parameter no_html - if 1, the html tags are NOT generated -%]
36
[%# Parameter no_html - if 1, the html tags are NOT generated -%]
37
[%- IF no_title -%][%- SET data.title = "" -%][%- END -%]
38
[%- IF data.title -%]
39
    [%- IF no_html -%]
40
        [%- span_start = '' -%]
41
        [%- span_end   = '' -%]
42
    [%- ELSE -%]
43
        [%- span_start = '<span class="patron-title">' -%]
44
        [%- span_end   = '</span>' -%]
45
    [%- END -%]
46
    [%- data.title = data.title | html -%]
47
    [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
48
[%- END -%]
49
[%- SET display_patron_name = 1 -%]
37
[%- SET display_patron_name = 1 -%]
50
[%- SET display_cardnumber = 1 -%]
38
[%- SET display_cardnumber = 1 -%]
51
[%- IF no_cardnumber -%][%- SET display_cardnumber = 0 -%][%- END -%]
39
[%- IF no_cardnumber -%][%- SET display_cardnumber = 0 -%][%- END -%]
Lines 75-95 Link Here
75
[%- BLOCK display_patron_name -%]
63
[%- BLOCK display_patron_name -%]
76
    [%- IF display_patron_name -%]
64
    [%- IF display_patron_name -%]
77
        [%- IF data.category_type == 'I' -%]
65
        [%- IF data.category_type == 'I' -%]
78
            [%- data.surname | html -%]
66
            [%- WRAPPER maybe_span field_name = 'surname' -%][%- data.surname | html -%][%- END -%]
79
            [%- IF data.othernames -%]([%- data.othernames | html -%])[%- END -%]
67
            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
80
        [%- ELSIF invert_name -%]
68
        [%- ELSIF invert_name -%]
81
            [%- 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 -%]
69
            [%- 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 -%]
71
            [%- 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 -%]
73
            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
82
        [%- ELSE -%]
74
        [%- ELSE -%]
83
            [%- data.title | $raw -%][%- data.preferred_name | html %][%- IF data.middle_name -%][% ' ' _ data.middle_name | html -%][%- END -%][%- IF data.othernames -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%]
75
            [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
84
            [% data.surname | html -%]
76
            [%- 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 -%]
78
            [%- IF data.othernames -%][%- WRAPPER maybe_span field_name='othernames' -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%][%- END -%]
79
            [%- WRAPPER maybe_span field_name='surname' -%][% ' ' _ data.surname | html -%][%- END -%]
85
        [%- END -%]
80
        [%- END -%]
86
        [%- IF display_cardnumber AND data.cardnumber -%][%- ' (' _ data.cardnumber _ ')' | html -%][%- END -%]
81
        [%- IF display_cardnumber AND data.cardnumber -%][%- WRAPPER maybe_span field_name='cardnumber' -%][%- ' (' _ data.cardnumber _ ')' | html -%][%- END -%][%- END -%]
87
    [%- ELSIF display_cardnumber -%]
82
    [%- ELSIF display_cardnumber -%]
88
        [%- IF data.cardnumber -%]
83
        [%- IF data.cardnumber -%]
89
            [%# FIXME Cardnumber should always be defined, right? -%]
84
            [%# FIXME Cardnumber should always be defined, right? -%]
90
            [%- data.cardnumber | html -%]
85
            [%- WRAPPER maybe_span field_name='cardnumber' -%][%- data.cardnumber | html -%][%- END -%]
91
        [%- END -%]
86
        [%- END -%]
92
    [%- ELSE -%]
87
    [%- ELSE -%]
93
        <span>A patron from library [%- Branches.GetName( patron.branchcode ) | html -%]</span>
88
        <span>A patron from library [%- Branches.GetName( patron.branchcode ) | html -%]</span>
94
    [%- END -%]
89
    [%- END -%]
95
[% END %]
90
[% END %]
96
- 
91
[%- BLOCK maybe_span -%]
92
    [%- IF no_html -%]
93
        [%- content | html -%]
94
    [%- ELSE -%]
95
        <span class="[% field_name | html %]">[%- content | html -%]</span>
96
    [%- END -%]
97
[%- END -%]

Return to bug 30568