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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+4 lines)
Lines 2596-2599 $star-selected: #EDB867; Link Here
2596
    }
2596
    }
2597
}
2597
}
2598
2598
2599
.branchaddress {
2600
    margin-bottom: 1rem;
2601
}
2602
2599
@import "responsive";
2603
@import "responsive";
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc (+114 lines)
Line 0 Link Here
1
[%~ USE Koha ~%]
2
[%~ USE raw ~%]
3
[%~ BLOCK 'display-library-address' ~%]
4
    [%~ SET line_break = "<br/>" ~%]
5
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
6
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
7
        [%~ PROCESS "display-library-address-${ Koha.Preference( 'AddressFormat' ) }" ~%]
8
    [%~ ELSE ~%]
9
        [%~ PROCESS 'display-library-address-us' ~%]
10
    [%~ END ~%]
11
[%~ END ~%]
12
13
[%~ BLOCK 'display-library-address-us' ~%]
14
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
15
        <span property="streetAddress">
16
            [%~ IF ( library.branchaddress1 ) ~%]
17
                <div class="branchaddress1">
18
                    [% library.branchaddress1 | html %]
19
                </div>
20
            [%~ END ~%]
21
            [%~ IF ( library.branchaddress2 ) ~%]
22
                <div class="branchaddress2">
23
                    [%~ library.branchaddress2 |html  ~%]
24
                </div>
25
            [%~ END ~%]
26
            [%~ IF ( library.branchaddress3 ) ~%]
27
                <span class="branchaddress3">
28
                    [%~ library.branchaddress3 | html ~%]
29
                </span>
30
                [% line_break | $raw %]
31
            [%~ END ~%]
32
        </span>
33
    [%~ END ~%]
34
    [%~ IF ( library.branchcity ) ~%]
35
        <div class="branchcity">
36
            <span property="addressLocality">
37
                [%~ library.branchcity |html  ~%]
38
            </span>
39
            [%~ IF ( library.branchstate ) %]
40
                <span property="addressRegion">
41
                    , [% library.branchstate |html  ~%]
42
                </span>
43
            [%~ END ~%]
44
            [%~ IF ( library.branchzip ) %]
45
                <span property="postalCode">
46
                    [%~ " " _ library.branchzip |html  ~%]
47
                </span>
48
            [%~ END ~%]
49
            [%~ IF ( library.branchcountry ) %]
50
                <div property="addressCountry">
51
                    [% library.branchcountry |html  ~%]
52
                </div>
53
            [%~ END ~%]
54
        </div>
55
    [%~ END ~%]
56
[%~ END ~%]
57
58
[%~ BLOCK 'display-library-address-de' ~%]
59
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
60
        <span property="streetAddress">
61
            [%~ IF ( library.branchaddress1 ) ~%]
62
                <div class="branchaddress1">
63
                    [%~ library.branchaddress1 | html ~%]
64
                </div>
65
            [%~ END ~%]
66
            [%~ IF ( library.branchaddress2 ) ~%]
67
                <div class="branchaddress2">
68
                    [%~ library.branchaddress2 | html ~%]
69
                </div>
70
            [%~ END ~%]
71
            [%~ IF ( library.branchaddress3 ) ~%]
72
                <span class="branchaddress3">
73
                    [%~ library.branchaddress3 | html ~%]
74
                </span>
75
                [% line_break | $raw %]
76
            [%~ END ~%]
77
        </span>
78
    [%~ END ~%]
79
    [%~ 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">
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 ~%]
111
            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%]
112
        </span>
113
    [%~ END ~%]
114
[%~ END ~%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt (-34 / +12 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% PROCESS 'display-library-address.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>
6
<title>
6
    [% IF ( LibraryNameTitle ) %]
7
    [% IF ( LibraryNameTitle ) %]
Lines 26-65 Link Here
26
[% END %]
27
[% END %]
27
28
28
[% BLOCK library_info %]
29
[% BLOCK library_info %]
29
    <div property="address" typeof="PostalAddress">
30
    <div class="branchaddress" property="address" typeof="PostalAddress">
30
        <span property="streetAddress">
31
        [% PROCESS 'display-library-address' %]
31
            [% IF ( library.branchaddress1 ) %]
32
                [% library.branchaddress1 | html %]
33
            [% END %]
34
            [% IF ( library.branchaddress2 ) %]
35
                <br />[% library.branchaddress2 | html %]
36
            [% END %]
37
            [% IF ( library.branchaddress3 ) %]
38
                <br />[% library.branchaddress3 | html %]
39
            [% END %]
40
        </span><br>
41
        [% IF ( library.branchcity ) %]
42
            <span property="addressLocality">[% library.branchcity | html %]</span>
43
        [% END %]
44
        [% IF ( library.branchstate ) %]
45
            <span property="addressRegion">[% library.branchstate | html %]</span>
46
        [% END %]
47
        [% IF ( library.branchzip ) %]
48
            <span property="postalCode">[% library.branchzip | html %]</span>
49
        [% END %]
50
        [% IF ( library.branchcountry ) %]
51
            <br /><span property="addressCountry">[% library.branchcountry | html %]</span>
52
        [% END %]
53
        [% IF ( library.branchphone ) %]
54
            <p>Phone: <a href="tel:[% library.branchphone | url %]" property="telephone">[% library.branchphone | html %]</a></p>
55
        [% END %]
56
        [% IF ( library.branchfax ) %]
57
            <p>Fax: <span property="faxNumber">[% library.branchfax | html %]</span></p>
58
        [% END %]
59
        [% IF ( library.branchurl ) %]
60
            <p><a href="[% library.branchurl | url %]" property="url">[% library.branchurl | html %]</a></p>
61
        [% END %]
62
    </div> <!-- /div property=address -->
32
    </div> <!-- /div property=address -->
33
    [% IF ( library.branchphone ) %]
34
        <p>Phone: <a href="tel:[% library.branchphone | url %]" property="telephone">[% library.branchphone | html %]</a></p>
35
    [% END %]
36
    [% IF ( library.branchfax ) %]
37
        <p>Fax: <span property="faxNumber">[% library.branchfax | html %]</span></p>
38
    [% END %]
39
    [% IF ( library.branchurl ) %]
40
        <p><a href="[% library.branchurl | url %]" property="url">[% library.branchurl | html %]</a></p>
41
    [% END %]
63
[% END %]
42
[% END %]
64
43
65
<div class="main">
44
<div class="main">
66
- 

Return to bug 27830