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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-5 / +5 lines)
Lines 23-32 Link Here
23
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
23
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
24
        [%~ END ~%]
24
        [%~ END ~%]
25
    [%~ END ~%]
25
    [%~ END ~%]
26
    [%~ IF ( patron.city ) ~%]
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 ) %], [% patron.state |html  ~%][%~ END ~%]
28
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html  ~%][%~ END ~%]
29
            [%~ " " _ patron.zipcode |html  ~%][%~ IF ( patron.country ) %], [% patron.country |html  ~%][%~ END ~%]
29
            [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html  ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state ) ~%], [% END ~%][% patron.country |html  ~%][%~ END ~%]
30
        </li>
30
        </li>
31
    [%~ END ~%]
31
    [%~ END ~%]
32
[%~ END ~%]
32
[%~ END ~%]
Lines 44-50 Link Here
44
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
44
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
45
        [%~ END ~%]
45
        [%~ END ~%]
46
    [%~ END ~%]
46
    [%~ END ~%]
47
    [%~ IF ( patron.city ) ~%]
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 ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
50
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
50
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
Lines 68-74 Link Here
68
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
68
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
69
        [%~ END ~%]
69
        [%~ END ~%]
70
    [%~ END ~%]
70
    [%~ END ~%]
71
    [%~ IF ( patron.city ) ~%]
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 ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
74
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
74
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc (-6 / +5 lines)
Lines 20-29 Link Here
20
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
20
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
21
        [% END %]
21
        [% END %]
22
    [% END %]
22
    [% END %]
23
    [% IF ( patron.B_city ) %]
23
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
24
        <li class="patroncity">
24
        <li class="patroncity">
25
            [% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
25
            [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
26
            [% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]
26
            [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html  ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state ) %], [% END %][% patron.B_country | html %][% END %]
27
        </li>
27
        </li>
28
    [% END %]
28
    [% END %]
29
[% END %]
29
[% END %]
Lines 41-47 Link Here
41
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
41
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
42
        [% END %]
42
        [% END %]
43
    [% END %]
43
    [% END %]
44
    [% IF ( patron.B_city ) %]
44
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
45
        <li class="patroncity">
45
        <li class="patroncity">
46
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
46
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
47
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
47
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
Lines 65-71 Link Here
65
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
65
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
66
        [% END %]
66
        [% END %]
67
    [% END %]
67
    [% END %]
68
    [% IF ( patron.B_city ) %]
68
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
69
        <li class="patroncity">
69
        <li class="patroncity">
70
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
70
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
71
            [% patron.B_city | html %]
71
            [% patron.B_city | html %]
72
- 

Return to bug 21794