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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-12 / +11 lines)
Lines 17-23 Link Here
17 
            [%~ IF patron.streettype ~%]
 17 
            [%~ IF patron.streettype ~%]
18 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 18 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
19 
            [%~ END ~%]
 19 
            [%~ END ~%]
20 
            <li class="patronaddress1">[%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html  ~%][%~ end | html %] [% patron.address | html %] [% IF roadtype_desc ~%][%~ roadtype_desc |html  %] [% END ~%][%~ end | html ~%]</li>
 20 
            <li class="patronaddress1">[%~ if (patron.streetnumber) | html ~%]<span class="streetnumber">[%~ patron.streetnumber |html  ~%]</span>[%~ end | html %] <span class="address1">[% patron.address | html %]</span> [% IF roadtype_desc ~%]<span class="roadtype">[%~ roadtype_desc |html  %]</span> [% END ~%][%~ end | html ~%]</li>
21 
        [%~ END ~%]
 21 
        [%~ END ~%]
22 
        [%~ IF ( patron.address2 ) ~%]
 22 
        [%~ IF ( patron.address2 ) ~%]
23 
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
 23 
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
Lines 25-32 Link Here
25 
    [%~ END ~%]
 25 
    [%~ END ~%]
26 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
 26 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
27 
        <li class="patroncity">
 27 
        <li class="patroncity">
28 
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html  ~%][%~ END ~%]
 28 
            <span class="city">[%~ patron.city |html  ~%]</span>[%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%]<span class="state">[% patron.state |html  ~%]</span>[%~ END ~%]
29 
            [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html  ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html  ~%][%~ END ~%]
 29 
            [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html  ~%]</span>[% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%]<span class="comma">,</span> [% END ~%]<span class="country">[% patron.country |html  ~%]</span>[%~ END ~%]
30 
        </li>
 30 
        </li>
31 
    [%~ END ~%]
 31 
    [%~ END ~%]
32 
[%~ END ~%]
 32 
[%~ END ~%]
Lines 38-44 Link Here
38 
            [%~ IF patron.streettype ~%]
 38 
            [%~ IF patron.streettype ~%]
39 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 39 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
40 
            [%~ END ~%]
 40 
            [%~ END ~%]
41 
            <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc %] [% roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber %] [% patron.streetnumber | html ~%][%~ END ~%]</li>
 41 
            <li class="patronaddress1"><span class="address1">[%~ patron.address | html ~%]</span>[%~IF roadtype_desc %] <span class="roadtype">[% roadtype_desc | html ~%]</span>[%~ END ~%][%~ IF patron.streetnumber %] <span class="streetnumber">[% patron.streetnumber | html ~%]</span>[%~ END ~%]</li>
42 
        [%~ END ~%]
 42 
        [%~ END ~%]
43 
        [%~ IF ( patron.address2 ) ~%]
 43 
        [%~ IF ( patron.address2 ) ~%]
44 
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
 44 
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
Lines 46-53 Link Here
46 
    [%~ END ~%]
 46 
    [%~ END ~%]
47 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
 47 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
48 
        <li class="patroncity">
 48 
        <li class="patroncity">
49 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
 49 
            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span> [% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%][% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>[%~ END ~%]
50 
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
 50 
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</psan>[%~ END ~%]
51 
        </li>
 51 
        </li>
52 
    [%~ END ~%]
 52 
    [%~ END ~%]
53 
[%~ END ~%]
 53 
[%~ END ~%]
Lines 59-67 Link Here
59 
            [%~ IF patron.streettype ~%]
 59 
            [%~ IF patron.streettype ~%]
60 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 60 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
61 
            [%~ END ~%]
 61 
            [%~ END ~%]
62 
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html %] [% END ~%]
 62 
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%]<span class="streetnumber">[%~ patron.streetnumber | html %]</span> [% END ~%]
63 
            [%~IF roadtype_desc ~%][%~ roadtype_desc | html %] [% END ~%]
 63 
            [%~IF roadtype_desc ~%]<span class="roadtype">[%~ roadtype_desc | html %]</span> [% END ~%]
64 
                [%~ patron.address | html ~%]
 64 
                <span class="address1">[%~ patron.address | html ~%]</span>
65 
            </li>
 65 
            </li>
66 
        [%~ END ~%]
 66 
        [%~ END ~%]
67 
        [%~ IF ( patron.address2 ) ~%]
 67 
        [%~ IF ( patron.address2 ) ~%]
Lines 70-77 Link Here
70 
    [%~ END ~%]
 70 
    [%~ END ~%]
71 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
 71 
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
72 
        <li class="patroncity">
 72 
        <li class="patroncity">
73 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
 73 
            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span> [% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%][% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>[%~ END ~%]
74 
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
 74 
            [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
75 
        </li>
 75 
        </li>
76 
    [%~ END ~%]
 76 
    [%~ END ~%]
77 
[%~ END ~%]
 77 
[%~ END ~%]
78 
-

Return to bug 36912