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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+1 lines)
Lines 2012-2017 li { Link Here
2012 
                clear: none;
 2012 
                clear: none;
2013 
                float: left;
 2013 
                float: left;
2014 
                list-style: none;
 2014 
                list-style: none;
2015 
                margin-left: 1ch;
2015 
            }
 2016 
            }
2016 
        }
 2017 
        }
2017 
    }
 2018 
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-9 / +8 lines)
Lines 14-20 Link Here
14 
            [%~ IF patron.streettype ~%]
 14 
            [%~ IF patron.streettype ~%]
15 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 15 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
16 
            [%~ END ~%]
 16 
            [%~ END ~%]
17 
            <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>
 17 
            <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>
18 
        [%~ END ~%]
 18 
        [%~ END ~%]
19 
        [%~ IF ( patron.address2 ) ~%]
 19 
        [%~ IF ( patron.address2 ) ~%]
20 
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
 20 
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
Lines 22-29 Link Here
22 
    [%~ END ~%]
 22 
    [%~ END ~%]
23 
    [%~ IF ( patron.city ) ~%]
 23 
    [%~ IF ( patron.city ) ~%]
24 
        <li class="patroncity">
 24 
        <li class="patroncity">
25 
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) ~%], [%~ patron.state |html  ~%][%~ END ~%]
 25 
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) %], [% patron.state |html  ~%][%~ END ~%]
26 
            [%~ patron.zipcode |html  ~%][%~ IF ( patron.country ) ~%], [%~ patron.country |html  ~%][%~ END ~%]
 26 
            [%~ " " _ patron.zipcode |html  ~%][%~ IF ( patron.country ) %], [% patron.country |html  ~%][%~ END ~%]
27 
        </li>
 27 
        </li>
28 
    [%~ END ~%]
 28 
    [%~ END ~%]
29 
[%~ END ~%]
 29 
[%~ END ~%]
Lines 35-41 Link Here
35 
            [%~ IF patron.streettype ~%]
 35 
            [%~ IF patron.streettype ~%]
36 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 36 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
37 
            [%~ END ~%]
 37 
            [%~ END ~%]
38 
            <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc ~%] [%~ roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber ~%] [%~ patron.streetnumber | html ~%][%~ END ~%]</li>
 38 
            <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc %] [% roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber %] [% patron.streetnumber | html ~%][%~ END ~%]</li>
39 
        [%~ END ~%]
 39 
        [%~ END ~%]
40 
        [%~ IF ( patron.address2 ) ~%]
 40 
        [%~ IF ( patron.address2 ) ~%]
41 
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
 41 
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
Lines 43-49 Link Here
43 
    [%~ END ~%]
 43 
    [%~ END ~%]
44 
    [%~ IF ( patron.city ) ~%]
 44 
    [%~ IF ( patron.city ) ~%]
45 
        <li class="patroncity">
 45 
        <li class="patroncity">
46 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
 46 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
47 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
 47 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
48 
        </li>
 48 
        </li>
49 
    [%~ END ~%]
 49 
    [%~ END ~%]
Lines 56-63 Link Here
56 
            [%~ IF patron.streettype ~%]
 56 
            [%~ IF patron.streettype ~%]
57 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
 57 
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
58 
            [%~ END ~%]
 58 
            [%~ END ~%]
59 
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html ~%] [%~ END ~%]
 59 
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html %] [% END ~%]
60 
            [%~IF roadtype_desc ~%][%~ roadtype_desc | html ~%] [%~ END ~%]
 60 
            [%~IF roadtype_desc ~%][%~ roadtype_desc | html %] [% END ~%]
61 
                [%~ patron.address | html ~%]
 61 
                [%~ patron.address | html ~%]
62 
            </li>
 62 
            </li>
63 
        [%~ END ~%]
 63 
        [%~ END ~%]
Lines 67-73 Link Here
67 
    [%~ END ~%]
 67 
    [%~ END ~%]
68 
    [%~ IF ( patron.city ) ~%]
 68 
    [%~ IF ( patron.city ) ~%]
69 
        <li class="patroncity">
 69 
        <li class="patroncity">
70 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
 70 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
71 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
 71 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
72 
        </li>
 72 
        </li>
73 
    [%~ END ~%]
 73 
    [%~ END ~%]
74 
-

Return to bug 22087