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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc (-48 / +14 lines)
Lines 3-12 Link Here
3
[%~ BLOCK 'display-library-address' ~%]
3
[%~ BLOCK 'display-library-address' ~%]
4
    [%~ SET line_break = "<br/>" ~%]
4
    [%~ SET line_break = "<br/>" ~%]
5
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
5
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
6
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
6
    [%~ IF Koha.Preference( 'AddressFormat' ) == "us" ~%]
7
        [%~ PROCESS "display-library-address-${ Koha.Preference( 'AddressFormat' ) }" ~%]
8
    [%~ ELSE ~%]
9
        [%~ PROCESS 'display-library-address-us' ~%]
7
        [%~ PROCESS 'display-library-address-us' ~%]
8
    [%~ ELSE ~%]
9
        [%~ PROCESS 'display-library-address-de-fr' ~%]
10
    [%~ END ~%]
10
    [%~ END ~%]
11
[%~ END ~%]
11
[%~ END ~%]
12
12
Lines 33-49 Link Here
33
    [%~ END ~%]
33
    [%~ END ~%]
34
    [%~ IF ( library.branchcity ) ~%]
34
    [%~ IF ( library.branchcity ) ~%]
35
        <div class="branchcity">
35
        <div class="branchcity">
36
            <span property="addressLocality">
36
            <span property="addressLocality">[%~ library.branchcity |html  ~%]</span>
37
                [%~ library.branchcity |html  ~%]
37
            [%~ IF ( library.branchstate ) %]<span property="addressRegion">, [% library.branchstate |html  ~%]</span>[%~ END ~%]
38
            </span>
39
            [%~ IF ( library.branchstate ) %]
40
                <span property="addressRegion">
41
                    , [% library.branchstate |html  ~%]
42
                </span>
43
            [%~ END ~%]
44
            [%~ IF ( library.branchzip ) %]
38
            [%~ IF ( library.branchzip ) %]
45
                <span property="postalCode">
39
                <span property="postalCode">
46
                    [%~ " " _ library.branchzip |html  ~%]
40
                    [%~ library.branchzip |html  ~%]
47
                </span>
41
                </span>
48
            [%~ END ~%]
42
            [%~ END ~%]
49
            [%~ IF ( library.branchcountry ) %]
43
            [%~ IF ( library.branchcountry ) %]
Lines 55-72 Link Here
55
    [%~ END ~%]
49
    [%~ END ~%]
56
[%~ END ~%]
50
[%~ END ~%]
57
51
58
[%~ BLOCK 'display-library-address-de' ~%]
52
[%~ BLOCK 'display-library-address-de-fr' ~%]
59
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
53
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
60
        <span property="streetAddress">
54
        <span property="streetAddress">
61
            [%~ IF ( library.branchaddress1 ) ~%]
55
            [%~ IF ( library.branchaddress1 ) ~%]
62
                <div class="branchaddress1">
56
                <span class="branchaddress1">
63
                    [%~ library.branchaddress1 | html ~%]
57
                    [%~ library.branchaddress1 | html ~%]
64
                </div>
58
                </span>
59
                [% line_break | $raw %]
65
            [%~ END ~%]
60
            [%~ END ~%]
66
            [%~ IF ( library.branchaddress2 ) ~%]
61
            [%~ IF ( library.branchaddress2 ) ~%]
67
                <div class="branchaddress2">
62
                <span class="branchaddress2">
68
                    [%~ library.branchaddress2 | html ~%]
63
                    [%~ library.branchaddress2 | html ~%]
69
                </div>
64
                </span>
65
                [% line_break | $raw %]
70
            [%~ END ~%]
66
            [%~ END ~%]
71
            [%~ IF ( library.branchaddress3 ) ~%]
67
            [%~ IF ( library.branchaddress3 ) ~%]
72
                <span class="branchaddress3">
68
                <span class="branchaddress3">
Lines 77-113 Link Here
77
        </span>
73
        </span>
78
    [%~ END ~%]
74
    [%~ END ~%]
79
    [%~ IF ( library.branchcity ) ~%]
75
    [%~ IF ( library.branchcity ) ~%]
80
        <div class="branchcity">
81
            [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%]
82
            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %][%~ library.branchcountry | html ~%][%~ END ~%]
83
        </div>
84
    [%~ END ~%]
85
[%~ END ~%]
86
87
[%~ BLOCK 'display-library-address-fr' ~%]
88
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
89
        [%~ IF ( library.branchaddress1 ) ~%]
90
            <span class="branchaddress1">
91
                [%~ library.branchaddress1 | html ~%]
92
            </span>
93
            [% line_break | $raw %]
94
        [%~ END ~%]
95
        [%~ IF ( library.branchaddress2 ) ~%]
96
            <span class="branchaddress2">
97
                [%~ library.branchaddress2 | html ~%]
98
            </span>
99
            [% line_break | $raw %]
100
        [%~ END ~%]
101
        [%~ IF ( library.branchaddress3 ) ~%]
102
            <span class="branchaddress3">
103
                [%~ library.branchaddress3 | html ~%]
104
            </span>
105
            [% line_break | $raw %]
106
        [%~ END ~%]
107
    [%~ END ~%]
108
    [%~ IF ( library.branchcity ) ~%]
109
        <span class="branchcity">
76
        <span class="branchcity">
110
            [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%]
77
            [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%]
111
            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%]
78
            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%]
112
        </span>
79
        </span>
113
    [%~ END ~%]
80
    [%~ END ~%]
114
- 

Return to bug 27830