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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-14 / +37 lines)
Lines 29-38 Link Here
29
    [%~ END ~%]
29
    [%~ END ~%]
30
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
30
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
31
        <li class="patroncity">
31
        <li class="patroncity">
32
            <span class="city">[%~ patron.city |html ~%]</span>[%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%],[% END ~%]<span class="state">[% patron.state |html ~%]</span>[%~ END ~%]
32
            <span class="city">[%~ patron.city |html ~%]</span>
33
            [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%]
33
            [%~ IF ( patron.state ) %]
34
                <span class="comma">,</span>
34
                [%~ IF ( patron.city ) ~%]
35
            [% END ~%]<span class="country">[% patron.country |html ~%]</span>[%~ END ~%]
35
                    ,
36
                [% END ~%]
37
                <span class="state">[% patron.state |html ~%]</span>
38
            [%~ END ~%]
39
            [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %]
40
            [%~ IF ( patron.country ) %]
41
                [% line_break | $raw %]
42
                <span class="country">[% patron.country |html ~%]</span>
43
            [%~ END ~%]
36
        </li>
44
        </li>
37
    [%~ END ~%]
45
    [%~ END ~%]
38
[%~ END ~%]
46
[%~ END ~%]
Lines 44-54 Link Here
44
            [%~ IF patron.streettype ~%]
52
            [%~ IF patron.streettype ~%]
45
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
53
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
46
            [%~ END ~%]
54
            [%~ END ~%]
47
            <li class="patronaddress1"
55
            <li class="patronaddress1">
48
                ><span class="address1">[%~ patron.address | html ~%]</span>[%~ IF roadtype_desc %]<span class="roadtype">[% roadtype_desc | html ~%]</span>[%~ END ~%][%~ IF patron.streetnumber %]
56
                <span class="address1">[%~ patron.address | html ~%]</span>
57
                [%~ IF roadtype_desc %]
58
                    <span class="roadtype">[% roadtype_desc | html ~%]</span>
59
                [%~ END ~%]
60
                [%~ IF patron.streetnumber %]
49
                    <span class="streetnumber">[% patron.streetnumber | html ~%]</span>
61
                    <span class="streetnumber">[% patron.streetnumber | html ~%]</span>
50
                [%~ END ~%]</li
62
                [%~ END ~%]
51
            >
63
            </li>
52
        [%~ END ~%]
64
        [%~ END ~%]
53
        [%~ IF ( patron.address2 ) ~%]
65
        [%~ IF ( patron.address2 ) ~%]
54
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
66
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
Lines 56-62 Link Here
56
    [%~ END ~%]
68
    [%~ END ~%]
57
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
69
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
58
        <li class="patroncity">
70
        <li class="patroncity">
59
            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
71
            [%~ IF ( patron.zipcode ) ~%]
72
                <span class="zipcode">[%~ patron.zipcode | html %]</span>
73
            [% END ~%]
74
            <span class="city">[%~ patron.city | html ~%]</span>
75
            [%~ IF ( patron.state ) ~%]
60
                [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
76
                [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
61
            [%~ END ~%]
77
            [%~ END ~%]
62
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
78
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
Lines 71-79 Link Here
71
            [%~ IF patron.streettype ~%]
87
            [%~ IF patron.streettype ~%]
72
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
88
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
73
            [%~ END ~%]
89
            [%~ END ~%]
74
            <li class="patronaddress1"
90
            <li class="patronaddress1">
75
                >[%~ IF patron.streetnumber ~%]<span class="streetnumber">[%~ patron.streetnumber | html %]</span>[% END ~%]
91
                [%~ IF patron.streetnumber ~%]
76
                [%~ IF roadtype_desc ~%]<span class="roadtype">[%~ roadtype_desc | html %]</span>[% END ~%]
92
                    <span class="streetnumber">[%~ patron.streetnumber | html %]</span>
93
                [% END ~%]
94
                [%~ IF roadtype_desc ~%]
95
                    <span class="roadtype">[%~ roadtype_desc | html %]</span>
96
                [% END ~%]
77
                <span class="address1">[%~ patron.address | html ~%]</span>
97
                <span class="address1">[%~ patron.address | html ~%]</span>
78
            </li>
98
            </li>
79
        [%~ END ~%]
99
        [%~ END ~%]
Lines 83-89 Link Here
83
    [%~ END ~%]
103
    [%~ END ~%]
84
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
104
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
85
        <li class="patroncity">
105
        <li class="patroncity">
86
            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
106
            [%~ IF ( patron.zipcode ) ~%]
107
                <span class="zipcode">[%~ patron.zipcode | html %]</span>
108
            [% END ~%]
109
            <span class="city">[%~ patron.city | html ~%]</span>
110
            [%~ IF ( patron.state ) ~%]
87
                [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
111
                [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
88
            [%~ END ~%]
112
            [%~ END ~%]
89
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
113
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
90
- 

Return to bug 40319