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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc (-221 / +223 lines)
Lines 1-252 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% BLOCK 'alt-address-style' %]
3
[% FILTER collapse %]
4
    <fieldset class="rows" id="memberentry_address">
4
    [% BLOCK 'alt-address-style' %]
5
        <legend id="alt_address_lgd">Alternate address</legend>
5
        <fieldset class="rows" id="memberentry_address">
6
        <ol>
6
            <legend id="alt_address_lgd">Alternate address</legend>
7
            [% IF Koha.Preference( 'AddressFormat' ) %]
7
            <ol>
8
                [% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
8
                [% IF Koha.Preference( 'AddressFormat' ) %]
9
            [% ELSE %]
9
                    [% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
10
                [% PROCESS 'member-alt-address-style-us' %]
10
                [% ELSE %]
11
            [% END %]
11
                    [% PROCESS 'member-alt-address-style-us' %]
12
        </ol>
12
                [% END %]
13
    </fieldset>
13
            </ol>
14
[% END %]
14
        </fieldset>
15
    [% END %]
16
17
    [% BLOCK 'member-alt-address-style-us' %]
18
        [% PROCESS 'alt-address-style_B_streetnumber' %]
19
        [% PROCESS 'alt-address-style_roadtypes' %]
20
        [% PROCESS 'alt-address-style_B_address' %]
21
        [% PROCESS 'alt-address-style_B_address2' %]
22
        [% PROCESS 'alt-address-style_B_city' %]
23
        [% PROCESS 'alt-address-style_B_state' %]
24
        [% PROCESS 'alt-address-style_B_zipcode' %]
25
        [% PROCESS 'alt-address-style_B_country' %]
26
        [% PROCESS 'alt-address-style_B_phone' %]
27
        [% PROCESS 'alt-address-style_B_email' %]
28
        [% PROCESS 'alt-address-style_B_contactnote' %]
29
    [% END %]
15
30
16
[% BLOCK 'member-alt-address-style-us' %]
31
    [% BLOCK 'member-alt-address-style-de' %]
17
    [% PROCESS 'alt-address-style_B_streetnumber' %]
32
        [% PROCESS 'alt-address-style_roadtypes' %]
18
    [% PROCESS 'alt-address-style_roadtypes' %]
33
        [% PROCESS 'alt-address-style_B_address' %]
19
    [% PROCESS 'alt-address-style_B_address' %]
34
        [% PROCESS 'alt-address-style_B_streetnumber' %]
20
    [% PROCESS 'alt-address-style_B_address2' %]
35
        [% PROCESS 'alt-address-style_B_address2' %]
21
    [% PROCESS 'alt-address-style_B_city' %]
36
        [% PROCESS 'alt-address-style_B_zipcode' %]
22
    [% PROCESS 'alt-address-style_B_state' %]
37
        [% PROCESS 'alt-address-style_B_city' %]
23
    [% PROCESS 'alt-address-style_B_zipcode' %]
38
        [% PROCESS 'alt-address-style_B_state' %]
24
    [% PROCESS 'alt-address-style_B_country' %]
39
        [% PROCESS 'alt-address-style_B_country' %]
25
    [% PROCESS 'alt-address-style_B_phone' %]
40
        [% PROCESS 'alt-address-style_B_phone' %]
26
    [% PROCESS 'alt-address-style_B_email' %]
41
        [% PROCESS 'alt-address-style_B_email' %]
27
    [% PROCESS 'alt-address-style_B_contactnote' %]
42
        [% PROCESS 'alt-address-style_B_contactnote' %]
28
[% END %]
43
    [% END %]
29
44
30
[% BLOCK 'member-alt-address-style-de' %]
45
    [% BLOCK 'member-alt-address-style-fr' %]
31
    [% PROCESS 'alt-address-style_roadtypes' %]
46
        [% PROCESS 'alt-address-style_B_streetnumber' %]
32
    [% PROCESS 'alt-address-style_B_address' %]
47
        [% PROCESS 'alt-address-style_roadtypes' %]
33
    [% PROCESS 'alt-address-style_B_streetnumber' %]
48
        [% PROCESS 'alt-address-style_B_address' %]
34
    [% PROCESS 'alt-address-style_B_address2' %]
49
        [% PROCESS 'alt-address-style_B_address2' %]
35
    [% PROCESS 'alt-address-style_B_zipcode' %]
50
        [% PROCESS 'alt-address-style_B_zipcode' %]
36
    [% PROCESS 'alt-address-style_B_city' %]
51
        [% PROCESS 'alt-address-style_B_city' %]
37
    [% PROCESS 'alt-address-style_B_state' %]
52
        [% PROCESS 'alt-address-style_B_state' %]
38
    [% PROCESS 'alt-address-style_B_country' %]
53
        [% PROCESS 'alt-address-style_B_country' %]
39
    [% PROCESS 'alt-address-style_B_phone' %]
54
        [% PROCESS 'alt-address-style_B_phone' %]
40
    [% PROCESS 'alt-address-style_B_email' %]
55
        [% PROCESS 'alt-address-style_B_email' %]
41
    [% PROCESS 'alt-address-style_B_contactnote' %]
56
        [% PROCESS 'alt-address-style_B_contactnote' %]
42
[% END %]
57
    [% END %]
43
58
44
[% BLOCK 'member-alt-address-style-fr' %]
59
    [% BLOCK 'alt-address-style_roadtypes' %]
45
    [% PROCESS 'alt-address-style_B_streetnumber' %]
60
        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
46
    [% PROCESS 'alt-address-style_roadtypes' %]
61
        [% IF roadtypes.count %]
47
    [% PROCESS 'alt-address-style_B_address' %]
62
            [% UNLESS noB_streettype %]
48
    [% PROCESS 'alt-address-style_B_address2' %]
63
                <li>
49
    [% PROCESS 'alt-address-style_B_zipcode' %]
64
                    [% IF ( mandatoryB_streettype ) %]
50
    [% PROCESS 'alt-address-style_B_city' %]
65
                        <label for="B_streettype" class="required">
51
    [% PROCESS 'alt-address-style_B_state' %]
66
                    [% ELSE %]
52
    [% PROCESS 'alt-address-style_B_country' %]
67
                        <label for="B_streettype">
53
    [% PROCESS 'alt-address-style_B_phone' %]
68
                    [% END %]
54
    [% PROCESS 'alt-address-style_B_email' %]
69
                    Street type: </label>
55
    [% PROCESS 'alt-address-style_B_contactnote' %]
70
                    <select name="B_streettype">
56
[% END %]
71
                        <option value=""></option>
72
                        [% FOR roadtype IN roadtypes %]
73
                            [% IF roadtype.authorised_value == patron.B_streettype %]
74
                                <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
75
                            [% ELSE %]
76
                                <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
77
                            [% END %]
78
                        [% END %]
79
                    </select>
80
                    [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
81
                </li>
82
            [% END %]
83
        [% END %]
84
    [% END %]
57
85
58
[% BLOCK 'alt-address-style_roadtypes' %]
86
    [% BLOCK 'alt-address-style_B_address' %]
59
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
87
        [% UNLESS noB_address %]
60
    [% IF roadtypes.count %]
61
        [% UNLESS noB_streettype %]
62
            <li>
88
            <li>
63
                [% IF ( mandatoryB_streettype ) %]
89
                [% IF ( mandatoryB_address ) %]
64
                    <label for="B_streettype" class="required">
90
                    <label for="B_address" class="required">
65
                [% ELSE %]
91
                [% ELSE %]
66
                    <label for="B_streettype">
92
                    <label for="B_address">
67
                [% END %]
93
                [% END %]
68
                Street type: </label>
94
                Address: </label>
69
                <select name="B_streettype">
95
                <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address | html %]" />
70
                    <option value=""></option>
96
            [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
71
                    [% FOR roadtype IN roadtypes %]
72
                        [% IF roadtype.authorised_value == patron.B_streettype %]
73
                            <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
74
                        [% ELSE %]
75
                            <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
76
                        [% END %]
77
                    [% END %]
78
                </select>
79
                [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
80
            </li>
97
            </li>
81
        [% END %]
98
        [% END %]
82
    [% END %]
99
    [% END %]
83
[% END %]
84
100
85
[% BLOCK 'alt-address-style_B_address' %]
101
    [% BLOCK 'alt-address-style_B_streetnumber' %]
86
    [% UNLESS noB_address %]
102
        [% UNLESS noB_streetnumber %]
87
        <li>
103
            <li>
88
            [% IF ( mandatoryB_address ) %]
104
                [% IF ( mandatoryB_streetnumber ) %]
89
                <label for="B_address" class="required">
105
                    <label for="B_streetnumber" class="required">
90
            [% ELSE %]
106
                [% ELSE %]
91
                <label for="B_address">
107
                    <label for="B_streetnumber">
92
            [% END %]
108
                [% END %]
93
            Address: </label>
109
                Street number: </label>
94
            <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address | html %]" />
110
                <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber | html %]" />
95
          [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
111
                [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
96
        </li>
112
            </li>
97
    [% END %]
113
        [% END %]
98
[% END %]
99
100
[% BLOCK 'alt-address-style_B_streetnumber' %]
101
    [% UNLESS noB_streetnumber %]
102
        <li>
103
            [% IF ( mandatoryB_streetnumber ) %]
104
                <label for="B_streetnumber" class="required">
105
            [% ELSE %]
106
                <label for="B_streetnumber">
107
            [% END %]
108
            Street number: </label>
109
            <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber | html %]" />
110
            [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
111
        </li>
112
    [% END %]
114
    [% END %]
113
[% END %]
114
115
115
[% BLOCK 'alt-address-style_B_address2' %]
116
    [% BLOCK 'alt-address-style_B_address2' %]
116
    [% UNLESS noB_address2 %]
117
        [% UNLESS noB_address2 %]
117
        <li>
118
            <li>
118
            [% IF ( mandatoryB_address2 ) %]
119
                [% IF ( mandatoryB_address2 ) %]
119
                <label for="B_address2" class="required">
120
                    <label for="B_address2" class="required">
120
            [% ELSE %]
121
                [% ELSE %]
121
                <label for="B_address2">
122
                    <label for="B_address2">
122
            [% END %]
123
                [% END %]
123
            Address 2: </label>
124
                Address 2: </label>
124
            <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 | html %]" />
125
                <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 | html %]" />
125
            [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
126
                [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
126
        </li>
127
            </li>
128
        [% END %]
127
    [% END %]
129
    [% END %]
128
[% END %]
129
130
130
[% BLOCK 'alt-address-style_B_zipcode' %]
131
    [% BLOCK 'alt-address-style_B_zipcode' %]
131
    [% UNLESS noB_zipcode %]
132
        [% UNLESS noB_zipcode %]
132
        <li>
133
            <li>
133
            [% IF ( mandatoryB_zipcode ) %]
134
                [% IF ( mandatoryB_zipcode ) %]
134
                <label for="B_zipcode" class="required">
135
                    <label for="B_zipcode" class="required">
135
            [% ELSE %]
136
                [% ELSE %]
136
                <label for="B_zipcode">
137
                    <label for="B_zipcode">
137
            [% END %]
138
                [% END %]
138
            ZIP/Postal code: </label>
139
                ZIP/Postal code: </label>
139
            <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode | html %]" />
140
                <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode | html %]" />
140
              [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
141
                [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
141
        </li>
142
            </li>
143
        [% END %]
142
    [% END %]
144
    [% END %]
143
[% END %]
144
145
145
[% BLOCK 'alt-address-style_B_city' %]
146
    [% BLOCK 'alt-address-style_B_city' %]
146
    [% UNLESS noB_city %]
147
        [% UNLESS noB_city %]
147
        <li>
148
            <li>
148
            [% IF ( mandatoryB_city ) %]
149
                [% IF ( mandatoryB_city ) %]
149
                <label for="B_city" class="required" >
150
                    <label for="B_city" class="required" >
150
            [% ELSE %]
151
                [% ELSE %]
151
                <label for="B_city">
152
                    <label for="B_city">
152
            [% END %]
153
                [% END %]
153
            City: </label>
154
                City: </label>
154
            [% IF cities.count %]
155
                [% IF cities.count %]
155
                <select class="select_city" data-addressfield="B_" name="select_city">
156
                    <select class="select_city" data-addressfield="B_" name="select_city">
156
                    <option value="|||"></option>
157
                        <option value="|||"></option>
157
                    [% FOREACH c IN cities %]
158
                        [% FOREACH c IN cities %]
158
                        [% IF c.city_name == patron.B_city && c.city_state == patron.B_state && c.city_zipcode == patron.B_zipcode %]
159
                            [% IF c.city_name == patron.B_city && c.city_state == patron.B_state && c.city_zipcode == patron.B_zipcode %]
159
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
160
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
160
                        [% ELSE %]
161
                            [% ELSE %]
161
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
162
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
163
                            [% END %]
164
                                [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
165
                            </option>
162
                        [% END %]
166
                        [% END %]
163
                            [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
167
                    </select>
164
                        </option>
168
                    <span class="hint">or enter</span>
165
                    [% END %]
169
                [% END %]
166
                </select>
170
                <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" />
167
                <span class="hint">or enter</span>
171
                [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
168
            [% END %]
172
            </li>
169
            <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" />
173
        [% END %]
170
            [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
171
        </li>
172
    [% END %]
174
    [% END %]
173
[% END %]
174
175
175
[% BLOCK 'alt-address-style_B_state' %]
176
    [% BLOCK 'alt-address-style_B_state' %]
176
    [% UNLESS noB_state %]
177
        [% UNLESS noB_state %]
177
        <li>
178
            <li>
178
            [% IF ( mandatoryB_state ) %]
179
                [% IF ( mandatoryB_state ) %]
179
                <label for="B_state" class="required" >
180
                    <label for="B_state" class="required" >
180
            [% ELSE %]
181
                [% ELSE %]
181
                <label for="B_state">
182
                    <label for="B_state">
182
            [% END %]
183
                [% END %]
183
            State: </label>
184
                State: </label>
184
            <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state | html %]" />
185
                <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state | html %]" />
185
            [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
186
                [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
186
        </li>
187
            </li>
188
        [% END %]
187
    [% END %]
189
    [% END %]
188
[% END %]
189
190
190
[% BLOCK 'alt-address-style_B_country' %]
191
    [% BLOCK 'alt-address-style_B_country' %]
191
    [% UNLESS noB_country %]
192
        [% UNLESS noB_country %]
192
        <li>
193
            <li>
193
            [% IF ( mandatoryB_country ) %]
194
                [% IF ( mandatoryB_country ) %]
194
                <label for="B_country" class="required">
195
                    <label for="B_country" class="required">
195
            [% ELSE %]
196
                [% ELSE %]
196
                <label for="B_country">
197
                    <label for="B_country">
197
            [% END %]
198
                [% END %]
198
            Country: </label>
199
                Country: </label>
199
            <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country | html %]" />
200
                <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country | html %]" />
200
            [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
201
                [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
201
        </li>
202
            </li>
203
        [% END %]
202
    [% END %]
204
    [% END %]
203
[% END %]
204
205
205
[% BLOCK 'alt-address-style_B_phone' %]
206
    [% BLOCK 'alt-address-style_B_phone' %]
206
    [% UNLESS noB_phone %]
207
        [% UNLESS noB_phone %]
207
        <li>
208
            <li>
208
            [% IF ( mandatoryB_phone ) %]
209
                [% IF ( mandatoryB_phone ) %]
209
                <label for="B_phone" class="required">
210
                    <label for="B_phone" class="required">
210
            [% ELSE %]
211
                [% ELSE %]
211
                <label for="B_phone">
212
                    <label for="B_phone">
212
            [% END %]
213
                [% END %]
213
            Phone: </label>
214
                Phone: </label>
214
            <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone | html %]" />
215
                <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone | html %]" />
215
            [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
216
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
216
        </li>
217
            </li>
218
        [% END %]
217
    [% END %]
219
    [% END %]
218
[% END %]
219
220
220
[% BLOCK 'alt-address-style_B_email' %]
221
    [% BLOCK 'alt-address-style_B_email' %]
221
    [% UNLESS noB_email %]
222
        [% UNLESS noB_email %]
222
        <li>
223
            <li>
223
            [% IF ( mandatoryB_email ) %]
224
                [% IF ( mandatoryB_email ) %]
224
                <label for="B_email" class="required">
225
                    <label for="B_email" class="required">
225
            [% ELSE %]
226
                [% ELSE %]
226
                <label for="B_email">
227
                    <label for="B_email">
227
            [% END %]
228
                [% END %]
228
            Email: </label>
229
                Email: </label>
229
            [% IF ( NoUpdateEmail ) %]
230
                [% IF ( NoUpdateEmail ) %]
230
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" disabled="disabled"/>
231
                <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" disabled="disabled"/>
231
            [% ELSE %]
232
                [% ELSE %]
232
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" />
233
                <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" />
233
            [% END %]
234
                [% END %]
234
            [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %]
235
                [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %]
235
        </li>
236
            </li>
237
        [% END %]
236
    [% END %]
238
    [% END %]
237
[% END %]
238
239
239
[% BLOCK 'alt-address-style_B_contactnote' %]
240
    [% BLOCK 'alt-address-style_B_contactnote' %]
240
    [% UNLESS nocontactnote %]
241
        [% UNLESS nocontactnote %]
241
        <li>
242
            <li>
242
            [% IF ( mandatorycontactnote ) %]
243
                [% IF ( mandatorycontactnote ) %]
243
                <label for="contactnote" class="required">
244
                    <label for="contactnote" class="required">
244
            [% ELSE %]
245
                [% ELSE %]
245
                <label for="contactnote">
246
                    <label for="contactnote">
246
            [% END %]
247
                [% END %]
247
            Contact note: </label>
248
                Contact note: </label>
248
            <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote | html %]</textarea>
249
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote | html %]</textarea>
249
            [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
250
                [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
250
        </li>
251
            </li>
252
        [% END %]
251
    [% END %]
253
    [% END %]
252
[% END %]
254
[% END # /FILTER collapse %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc (-176 / +178 lines)
Lines 1-199 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% BLOCK 'alt-contact-style' %]
2
[% FILTER collapse %]
3
    <fieldset class="rows" id="memberentry_altaddress">
3
    [% BLOCK 'alt-contact-style' %]
4
        <legend id="alt_contact_lgd">Alternate contact</legend>
4
        <fieldset class="rows" id="memberentry_altaddress">
5
        <ol>
5
            <legend id="alt_contact_lgd">Alternate contact</legend>
6
            [% IF Koha.Preference( 'AddressFormat' ) %]
6
            <ol>
7
                [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %]
7
                [% IF Koha.Preference( 'AddressFormat' ) %]
8
            [% ELSE %]
8
                    [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %]
9
                [% PROCESS 'member-alt-contact-style-us' %]
9
                [% ELSE %]
10
            [% END %]
10
                    [% PROCESS 'member-alt-contact-style-us' %]
11
        </ol>
11
                [% END %]
12
    </fieldset>
12
            </ol>
13
[% END %]
13
        </fieldset>
14
    [% END %]
14
15
15
[% BLOCK 'member-alt-contact-style-us' %]
16
    [% BLOCK 'member-alt-contact-style-us' %]
16
    [% PROCESS 'alt-contact-style_altcontactsurname' %]
17
        [% PROCESS 'alt-contact-style_altcontactsurname' %]
17
    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
18
        [% PROCESS 'alt-contact-style_altcontactfirstname' %]
18
    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
19
        [% PROCESS 'alt-contact-style_altcontactaddress1' %]
19
    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
20
        [% PROCESS 'alt-contact-style_altcontactaddress2' %]
20
    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
21
        [% PROCESS 'alt-contact-style_altcontactaddress3' %]
21
    [% PROCESS 'alt-contact-style_altcontactstate' %]
22
        [% PROCESS 'alt-contact-style_altcontactstate' %]
22
    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
23
        [% PROCESS 'alt-contact-style_altcontactzipcode' %]
23
    [% PROCESS 'alt-contact-style_altcontactcountry' %]
24
        [% PROCESS 'alt-contact-style_altcontactcountry' %]
24
    [% PROCESS 'alt-contact-style_altcontactphone' %]
25
        [% PROCESS 'alt-contact-style_altcontactphone' %]
25
[% END %]
26
    [% END %]
26
27
27
[% BLOCK 'member-alt-contact-style-de' %]
28
    [% BLOCK 'member-alt-contact-style-de' %]
28
    [% PROCESS 'alt-contact-style_altcontactsurname' %]
29
        [% PROCESS 'alt-contact-style_altcontactsurname' %]
29
    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
30
        [% PROCESS 'alt-contact-style_altcontactfirstname' %]
30
    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
31
        [% PROCESS 'alt-contact-style_altcontactaddress1' %]
31
    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
32
        [% PROCESS 'alt-contact-style_altcontactaddress2' %]
32
    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
33
        [% PROCESS 'alt-contact-style_altcontactzipcode' %]
33
    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
34
        [% PROCESS 'alt-contact-style_altcontactaddress3' %]
34
    [% PROCESS 'alt-contact-style_altcontactstate' %]
35
        [% PROCESS 'alt-contact-style_altcontactstate' %]
35
    [% PROCESS 'alt-contact-style_altcontactcountry' %]
36
        [% PROCESS 'alt-contact-style_altcontactcountry' %]
36
    [% PROCESS 'alt-contact-style_altcontactphone' %]
37
        [% PROCESS 'alt-contact-style_altcontactphone' %]
37
[% END %]
38
    [% END %]
38
39
39
[% BLOCK 'member-alt-contact-style-fr' %]
40
    [% BLOCK 'member-alt-contact-style-fr' %]
40
    [% PROCESS 'alt-contact-style_altcontactsurname' %]
41
        [% PROCESS 'alt-contact-style_altcontactsurname' %]
41
    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
42
        [% PROCESS 'alt-contact-style_altcontactfirstname' %]
42
    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
43
        [% PROCESS 'alt-contact-style_altcontactaddress1' %]
43
    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
44
        [% PROCESS 'alt-contact-style_altcontactaddress2' %]
44
    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
45
        [% PROCESS 'alt-contact-style_altcontactzipcode' %]
45
    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
46
        [% PROCESS 'alt-contact-style_altcontactaddress3' %]
46
    [% PROCESS 'alt-contact-style_altcontactstate' %]
47
        [% PROCESS 'alt-contact-style_altcontactstate' %]
47
    [% PROCESS 'alt-contact-style_altcontactcountry' %]
48
        [% PROCESS 'alt-contact-style_altcontactcountry' %]
48
    [% PROCESS 'alt-contact-style_altcontactphone' %]
49
        [% PROCESS 'alt-contact-style_altcontactphone' %]
49
[% END %]
50
    [% END %]
50
51
51
[% BLOCK 'alt-contact-style_altcontactsurname' %]
52
    [% BLOCK 'alt-contact-style_altcontactsurname' %]
52
    [% UNLESS noaltcontactsurname %]
53
        [% UNLESS noaltcontactsurname %]
53
        <li>
54
            <li>
54
            [% IF ( mandatoryaltcontactsurname ) %]
55
                [% IF ( mandatoryaltcontactsurname ) %]
55
                <label for="altcontactsurname" class="required">
56
                    <label for="altcontactsurname" class="required">
56
            [% ELSE %]
57
                [% ELSE %]
57
                <label for="altcontactsurname">
58
                    <label for="altcontactsurname">
58
            [% END %]
59
                [% END %]
59
            Surname: </label>
60
                Surname: </label>
60
            <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
61
                <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
61
            [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
62
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
62
        </li>
63
            </li>
64
        [% END %]
63
    [% END %]
65
    [% END %]
64
[% END %]
65
66
66
[% BLOCK 'alt-contact-style_altcontactfirstname' %]
67
    [% BLOCK 'alt-contact-style_altcontactfirstname' %]
67
    [% UNLESS noaltcontactfirstname %]
68
        [% UNLESS noaltcontactfirstname %]
68
        <li>
69
            <li>
69
            [% IF ( mandatoryaltcontactfirstname ) %]
70
                [% IF ( mandatoryaltcontactfirstname ) %]
70
                <label for="altcontactfirstname" class="required">
71
                    <label for="altcontactfirstname" class="required">
71
            [% ELSE %]
72
                [% ELSE %]
72
                <label for="altcontactfirstname">
73
                    <label for="altcontactfirstname">
73
            [% END %]
74
                [% END %]
74
            First name: </label>
75
                First name: </label>
75
            <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
76
                <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
76
            [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
77
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
77
        </li>
78
            </li>
79
        [% END %]
78
    [% END %]
80
    [% END %]
79
[% END %]
80
81
81
[% BLOCK 'alt-contact-style_altcontactaddress1' %]
82
    [% BLOCK 'alt-contact-style_altcontactaddress1' %]
82
    [% UNLESS noaltcontactaddress1 %]
83
        [% UNLESS noaltcontactaddress1 %]
83
        <li>
84
            <li>
84
            [% IF ( mandatoryaltcontactaddress1 ) %]
85
                [% IF ( mandatoryaltcontactaddress1 ) %]
85
                <label for="altcontactaddress1" class="required">
86
                    <label for="altcontactaddress1" class="required">
86
            [% ELSE %]
87
                [% ELSE %]
87
                <label for="altcontactaddress1">
88
                    <label for="altcontactaddress1">
88
            [% END %]
89
                [% END %]
89
            Address: </label>
90
                Address: </label>
90
            <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
91
                <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
91
            [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
92
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
92
        </li>
93
            </li>
94
        [% END %]
93
    [% END %]
95
    [% END %]
94
[% END %]
95
96
96
[% BLOCK 'alt-contact-style_altcontactaddress2' %]
97
    [% BLOCK 'alt-contact-style_altcontactaddress2' %]
97
    [% UNLESS noaltcontactaddress2 %]
98
        [% UNLESS noaltcontactaddress2 %]
98
        <li>
99
            <li>
99
            [% IF ( mandatoryaltcontactaddress2 ) %]
100
                [% IF ( mandatoryaltcontactaddress2 ) %]
100
                <label for="altcontactaddress2" class="required">
101
                    <label for="altcontactaddress2" class="required">
101
            [% ELSE %]
102
                [% ELSE %]
102
                <label for="altcontactaddress2">
103
                    <label for="altcontactaddress2">
103
            [% END %]
104
                [% END %]
104
            Address 2: </label>
105
                Address 2: </label>
105
            <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
106
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
106
            [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
107
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
107
        </li>
108
            </li>
109
        [% END %]
108
    [% END %]
110
    [% END %]
109
[% END %]
110
111
111
[% BLOCK 'alt-contact-style_altcontactzipcode' %]
112
    [% BLOCK 'alt-contact-style_altcontactzipcode' %]
112
    [% UNLESS noaltcontactzipcode %]
113
        [% UNLESS noaltcontactzipcode %]
113
        <li>
114
            <li>
114
            [% IF ( mandatoryaltcontactzipcode ) %]
115
                [% IF ( mandatoryaltcontactzipcode ) %]
115
                <label for="altcontactzipcode" class="required">
116
                    <label for="altcontactzipcode" class="required">
116
            [% ELSE %]
117
                [% ELSE %]
117
                <label for="altcontactzipcode">
118
                    <label for="altcontactzipcode">
118
            [% END %]
119
                [% END %]
119
            ZIP/Postal code: </label>
120
                ZIP/Postal code: </label>
120
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
121
    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
121
            [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
122
                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
122
        </li>
123
            </li>
124
        [% END %]
123
    [% END %]
125
    [% END %]
124
[% END %]
125
126
126
[% BLOCK 'alt-contact-style_altcontactaddress3' %]
127
    [% BLOCK 'alt-contact-style_altcontactaddress3' %]
127
    [% UNLESS noaltcontactaddress3 %]
128
        [% UNLESS noaltcontactaddress3 %]
128
        <li>
129
            <li>
129
            [% IF ( mandatoryaltcontactaddress3 ) %]
130
                [% IF ( mandatoryaltcontactaddress3 ) %]
130
                <label for="altcontactaddress3" class="required">
131
                    <label for="altcontactaddress3" class="required">
131
            [% ELSE %]
132
                [% ELSE %]
132
                <label for="altcontactaddress3">
133
                    <label for="altcontactaddress3">
133
            [% END %]
134
                [% END %]
134
            City: </label>
135
                City: </label>
135
            [% IF cities.count %]
136
                [% IF cities.count %]
136
                <select class="select_city" data-addressfield="altcontact" name="select_city">
137
                    <select class="select_city" data-addressfield="altcontact" name="select_city">
137
                    <option value="|||"></option>
138
                        <option value="|||"></option>
138
                    [% FOREACH c IN cities %]
139
                        [% FOREACH c IN cities %]
139
                        [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
140
                            [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
140
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
141
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
141
                        [% ELSE %]
142
                            [% ELSE %]
142
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
143
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
144
                            [% END %]
145
                                [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
146
                            </option>
143
                        [% END %]
147
                        [% END %]
144
                            [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
148
                    </select>
145
                        </option>
149
                    <span class="hint">or enter</span>
146
                    [% END %]
150
                [% END %]
147
                </select>
151
                <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
148
                <span class="hint">or enter</span>
152
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
149
            [% END %]
153
            </li>
150
            <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
154
        [% END %]
151
            [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
152
        </li>
153
    [% END %]
155
    [% END %]
154
[% END %]
155
156
156
[% BLOCK 'alt-contact-style_altcontactstate' %]
157
    [% BLOCK 'alt-contact-style_altcontactstate' %]
157
    [% UNLESS noaltcontactstate %]
158
        [% UNLESS noaltcontactstate %]
158
        <li>
159
            <li>
159
            [% IF ( mandatoryaltcontactstate ) %]
160
                [% IF ( mandatoryaltcontactstate ) %]
160
                <label for="altcontactstate" class="required">
161
                    <label for="altcontactstate" class="required">
161
            [% ELSE %]
162
                [% ELSE %]
162
                <label for="altcontactstate">
163
                    <label for="altcontactstate">
163
            [% END %]
164
                [% END %]
164
            State: </label>
165
                State: </label>
165
            <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
166
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
166
            [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
167
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
167
        </li>
168
            </li>
169
        [% END %]
168
    [% END %]
170
    [% END %]
169
[% END %]
170
171
171
[% BLOCK 'alt-contact-style_altcontactcountry' %]
172
    [% BLOCK 'alt-contact-style_altcontactcountry' %]
172
    [% UNLESS noaltcontactcountry %]
173
        [% UNLESS noaltcontactcountry %]
173
        <li>
174
            <li>
174
            [% IF ( mandatoryaltcontactcountry ) %]
175
                [% IF ( mandatoryaltcontactcountry ) %]
175
                <label for="altcontactcountry" class="required">
176
                    <label for="altcontactcountry" class="required">
176
            [% ELSE %]
177
                [% ELSE %]
177
                <label for="altcontactcountry">
178
                    <label for="altcontactcountry">
178
            [% END %]
179
                [% END %]
179
            Country: </label>
180
                Country: </label>
180
            <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
181
                <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
181
            [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
182
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
182
        </li>
183
            </li>
184
        [% END %]
183
    [% END %]
185
    [% END %]
184
[% END %]
185
186
186
[% BLOCK 'alt-contact-style_altcontactphone' %]
187
    [% BLOCK 'alt-contact-style_altcontactphone' %]
187
    [% UNLESS noaltcontactphone %]
188
        [% UNLESS noaltcontactphone %]
188
        <li>
189
            <li>
189
            [% IF ( mandatoryaltcontactphone ) %]
190
                [% IF ( mandatoryaltcontactphone ) %]
190
                <label for="altcontactphone" class="required">
191
                    <label for="altcontactphone" class="required">
191
            [% ELSE %]
192
                [% ELSE %]
192
                <label for="altcontactphone">
193
                    <label for="altcontactphone">
193
            [% END %]
194
                [% END %]
194
            Phone: </label>
195
                Phone: </label>
195
            <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
196
                <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
196
            [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
197
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
197
        </li>
198
            </li>
199
        [% END %]
198
    [% END %]
200
    [% END %]
199
[% END %]
201
[% END # /FILTER collapse %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-73 / +75 lines)
Lines 1-77 Link Here
1
[%~ USE Koha ~%]
1
[% USE Koha %]
2
[%~ USE raw ~%]
2
[% USE raw %]
3
[%~ BLOCK 'display-address-style' ~%]
3
[% FILTER collapse %]
4
    [%~ SET line_break = "<br/>" ~%]
4
    [% BLOCK 'display-address-style' %]
5
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
5
        [% SET line_break = "<br/>" %]
6
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
6
        [% IF no_line_break %][% SET line_break = " " %][% END %]
7
        [%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%]
7
        [% IF Koha.Preference( 'AddressFormat' ) %]
8
    [%~ ELSE ~%]
8
            [% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
9
        [%~ PROCESS 'member-display-address-style-us' ~%]
9
        [% ELSE %]
10
    [%~ END ~%]
10
            [% PROCESS 'member-display-address-style-us' %]
11
[%~ END ~%]
11
        [% END %]
12
    [% END %]
12
13
13
[%~ BLOCK 'member-display-address-style-us' ~%]
14
    [% BLOCK 'member-display-address-style-us' %]
14
    [%~ IF ( patron.address or patron.address2 ) ~%]
15
        [% IF ( patron.address or patron.address2 ) %]
15
        [%~ IF ( patron.address ) ~%]
16
            [% IF ( patron.address ) %]
16
            [%~ SET roadtype_desc = '' ~%]
17
                [% SET roadtype_desc = '' %]
17
            [%~ IF patron.streettype ~%]
18
                [% IF patron.streettype %]
18
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
19
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
19
            [%~ END ~%]
20
                [% 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>
21
                <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>
21
        [%~ END ~%]
22
            [% END %]
22
        [%~ IF ( patron.address2 ) ~%]
23
            [% IF ( patron.address2 ) %]
23
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
24
                <li class="patronaddress2">[% patron.address2 |html  %]</li>
24
        [%~ END ~%]
25
            [% END %]
25
    [%~ END ~%]
26
        [% END %]
26
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
27
        [% IF ( patron.city || patron.zipcode || patron.state || patron.country ) %]
27
        <li class="patroncity">
28
            <li class="patroncity">
28
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html  ~%][%~ END ~%]
29
                [% patron.city |html  %][% IF ( patron.state ) %][% IF ( patron.city ) %], [% END %][% patron.state |html  %][% END %]
29
            [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html  ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html  ~%][%~ END ~%]
30
                [% IF ( patron.zipcode ) %][% " " _ patron.zipcode |html  %][% END %][% IF ( patron.country ) %][% IF ( patron.zipcode || patron.state || patron.city ) %], [% END %][% patron.country |html  %][% END %]
30
        </li>
31
            </li>
31
    [%~ END ~%]
32
        [% END %]
32
[%~ END ~%]
33
    [% END %]
33
34
34
[%~ BLOCK 'member-display-address-style-de' ~%]
35
    [% BLOCK 'member-display-address-style-de' %]
35
    [%~ IF ( patron.address or patron.address2 ) ~%]
36
        [% IF ( patron.address or patron.address2 ) %]
36
        [%~ IF ( patron.address ) ~%]
37
            [% IF ( patron.address ) %]
37
            [%~ SET roadtype_desc = '' ~%]
38
                [% SET roadtype_desc = '' %]
38
            [%~ IF patron.streettype ~%]
39
                [% IF patron.streettype %]
39
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
40
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
40
            [%~ END ~%]
41
                [% END %]
41
            <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc %] [% roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber %] [% patron.streetnumber | html ~%][%~ END ~%]</li>
42
                <li class="patronaddress1">[% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]</li>
42
        [%~ END ~%]
43
            [% END %]
43
        [%~ IF ( patron.address2 ) ~%]
44
            [% IF ( patron.address2 ) %]
44
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
45
                <li class="patronaddress2">[% patron.address2 | html %]</li>
45
        [%~ END ~%]
46
            [% END %]
46
    [%~ END ~%]
47
        [% END %]
47
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
48
        [% IF ( patron.city || patron.zipcode || patron.state || patron.country ) %]
48
        <li class="patroncity">
49
            <li class="patroncity">
49
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
50
                [% 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 ~%]
51
                [% IF ( patron.country ) %][% line_break | $raw %][% patron.country | html %][% END %]
51
        </li>
52
            </li>
52
    [%~ END ~%]
53
        [% END %]
53
[%~ END ~%]
54
    [% END %]
54
55
55
[%~ BLOCK 'member-display-address-style-fr' ~%]
56
    [% BLOCK 'member-display-address-style-fr' %]
56
    [%~ IF ( patron.address or patron.address2 ) ~%]
57
        [% IF ( patron.address or patron.address2 ) %]
57
        [%~ IF ( patron.address ) ~%]
58
            [% IF ( patron.address ) %]
58
            [%~ SET roadtype_desc = '' ~%]
59
                [% SET roadtype_desc = '' %]
59
            [%~ IF patron.streettype ~%]
60
                [% IF patron.streettype %]
60
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
61
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
61
            [%~ END ~%]
62
                [% END %]
62
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html %] [% END ~%]
63
                <li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
63
            [%~IF roadtype_desc ~%][%~ roadtype_desc | html %] [% END ~%]
64
                [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
64
                [%~ patron.address | html ~%]
65
                    [% patron.address | html %]
66
                </li>
67
            [% END %]
68
            [% IF ( patron.address2 ) %]
69
                <li class="patronaddress2">[% patron.address2 | html %]</li>
70
            [% END %]
71
        [% END %]
72
        [% IF ( patron.city || patron.zipcode || patron.state || patron.country ) %]
73
            <li class="patroncity">
74
                [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% line_break | $raw %][% patron.state | html %][% END %]
75
                [% IF ( patron.country ) %][% line_break | $raw %][% patron.country | html %][% END %]
65
            </li>
76
            </li>
66
        [%~ END ~%]
77
        [% END %]
67
        [%~ IF ( patron.address2 ) ~%]
78
    [% END %]
68
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
79
[% END # /FILTER collapse %]
69
        [%~ END ~%]
70
    [%~ END ~%]
71
    [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
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 ~%]
74
            [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
75
        </li>
76
    [%~ END ~%]
77
[%~ END ~%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc (-59 / +61 lines)
Lines 1-76 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% BLOCK 'display-alt-address-style' %]
2
[% FILTER collapse %]
3
    [% IF Koha.Preference( 'AddressFormat' ) %]
3
    [% BLOCK 'display-alt-address-style' %]
4
        [% PROCESS "member-alt-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
4
        [% IF Koha.Preference( 'AddressFormat' ) %]
5
    [% ELSE %]
5
            [% PROCESS "member-alt-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
6
        [% PROCESS 'member-alt-display-address-style-us' %]
6
        [% ELSE %]
7
            [% PROCESS 'member-alt-display-address-style-us' %]
8
        [% END %]
7
    [% END %]
9
    [% END %]
8
[% END %]
9
10
10
[% BLOCK 'member-alt-display-address-style-us' %]
11
    [% BLOCK 'member-alt-display-address-style-us' %]
11
    [% IF ( patron.B_address or patron.B_address2 ) %]
12
        [% IF ( patron.B_address or patron.B_address2 ) %]
12
        [% IF ( patron.B_address ) %]
13
            [% IF ( patron.B_address ) %]
13
            [% SET roadtype_desc = '' %]
14
                [% SET roadtype_desc = '' %]
14
            [% IF patron.B_streettype %]
15
                [% IF patron.B_streettype %]
15
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
16
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
17
                [% END %]
18
                <li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
19
            [% END %]
20
            [% IF ( patron.B_address2 ) %]
21
                <li class="patronaddress2">[% patron.B_address2 | html %]</li>
16
            [% END %]
22
            [% END %]
17
            <li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
18
        [% END %]
23
        [% END %]
19
        [% IF ( patron.B_address2 ) %]
24
        [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
20
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
25
            <li class="patroncity">
26
                [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
27
                [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html  ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %]
28
            </li>
21
        [% END %]
29
        [% END %]
22
    [% END %]
30
    [% END %]
23
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
24
        <li class="patroncity">
25
            [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
26
            [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html  ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %]
27
        </li>
28
    [% END %]
29
[% END %]
30
31
31
[% BLOCK 'member-alt-display-address-style-de' %]
32
    [% BLOCK 'member-alt-display-address-style-de' %]
32
    [% IF ( patron.B_address or patron.B_address2 ) %]
33
        [% IF ( patron.B_address or patron.B_address2 ) %]
33
        [% IF ( patron.B_address ) %]
34
            [% IF ( patron.B_address ) %]
34
            [% SET roadtype_desc = '' %]
35
                [% SET roadtype_desc = '' %]
35
            [% IF patron.B_streettype %]
36
                [% IF patron.B_streettype %]
36
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
37
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
38
                [% END %]
39
                <li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
40
            [% END %]
41
            [% IF ( patron.B_address2 ) %]
42
                <li class="patronaddress2">[% patron.B_address2 | html %]</li>
37
            [% END %]
43
            [% END %]
38
            <li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
39
        [% END %]
44
        [% END %]
40
        [% IF ( patron.B_address2 ) %]
45
        [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
41
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
46
            <li class="patroncity">
47
                [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
48
                [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
49
            </li>
42
        [% END %]
50
        [% END %]
43
    [% END %]
51
    [% END %]
44
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
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 %]
47
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
48
        </li>
49
    [% END %]
50
[% END %]
51
52
52
[% BLOCK 'member-alt-display-address-style-fr' %]
53
    [% BLOCK 'member-alt-display-address-style-fr' %]
53
    [% IF ( patron.B_address or patron.B_address2 ) %]
54
        [% IF ( patron.B_address or patron.B_address2 ) %]
54
        [% IF ( patron.B_address ) %]
55
            [% IF ( patron.B_address ) %]
55
            [% SET roadtype_desc = '' %]
56
                [% SET roadtype_desc = '' %]
56
            [% IF patron.B_streettype %]
57
                [% IF patron.B_streettype %]
57
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
58
                    [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
59
                [% END %]
60
                <li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
61
                [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
62
                    [% patron.B_address | html %]
63
                </li>
64
            [% END %]
65
            [% IF ( patron.B_address2 ) %]
66
                <li class="patronaddress2">[% patron.B_address2 | html %]</li>
58
            [% END %]
67
            [% END %]
59
            <li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
60
            [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
61
                [% patron.B_address | html %]
62
            </li>
63
        [% END %]
68
        [% END %]
64
        [% IF ( patron.B_address2 ) %]
69
        [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
65
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
70
            <li class="patroncity">
71
                [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
72
                [% patron.B_city | html %]
73
                [% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
74
                [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
75
            </li>
66
        [% END %]
76
        [% END %]
67
    [% END %]
77
    [% END %]
68
    [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
78
[% END # /FILTER collapse %]
69
        <li class="patroncity">
70
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
71
            [% patron.B_city | html %]
72
            [% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
73
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
74
        </li>
75
    [% END %]
76
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc (-169 / +171 lines)
Lines 1-194 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% BLOCK 'main-address-style' %]
3
[% FILTER collapse %]
4
    <fieldset class="rows" id="memberentry_mainaddress">
4
    [% BLOCK 'main-address-style' %]
5
        <legend id="main_address_lgd">Main address</legend>
5
        <fieldset class="rows" id="memberentry_mainaddress">
6
        <ol>
6
            <legend id="main_address_lgd">Main address</legend>
7
            [% IF Koha.Preference( 'AddressFormat' ) %]
7
            <ol>
8
                [% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
8
                [% IF Koha.Preference( 'AddressFormat' ) %]
9
            [% ELSE %]
9
                    [% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
10
                [% PROCESS 'member-main-address-style-us' %]
10
                [% ELSE %]
11
            [% END %]
11
                    [% PROCESS 'member-main-address-style-us' %]
12
        </ol>
12
                [% END %]
13
    </fieldset>
13
            </ol>
14
[% END %]
14
        </fieldset>
15
    [% END %]
15
16
16
[% BLOCK 'member-main-address-style-us' %]
17
    [% BLOCK 'member-main-address-style-us' %]
17
    [% PROCESS 'address-style_streetnumber' %]
18
        [% PROCESS 'address-style_streetnumber' %]
18
    [% PROCESS 'address-style_roadtypes' %]
19
        [% PROCESS 'address-style_roadtypes' %]
19
    [% PROCESS 'address-style_address' %]
20
        [% PROCESS 'address-style_address' %]
20
    [% PROCESS 'address-style_address2' %]
21
        [% PROCESS 'address-style_address2' %]
21
    [% PROCESS 'address-style_city' %]
22
        [% PROCESS 'address-style_city' %]
22
    [% PROCESS 'address-style_state' %]
23
        [% PROCESS 'address-style_state' %]
23
    [% PROCESS 'address-style_zipcode' %]
24
        [% PROCESS 'address-style_zipcode' %]
24
    [% PROCESS 'address-style_country' %]
25
        [% PROCESS 'address-style_country' %]
25
[% END %]
26
    [% END %]
26
27
27
[% BLOCK 'member-main-address-style-de' %]
28
    [% BLOCK 'member-main-address-style-de' %]
28
    [% PROCESS 'address-style_roadtypes' %]
29
        [% PROCESS 'address-style_roadtypes' %]
29
    [% PROCESS 'address-style_address' %]
30
        [% PROCESS 'address-style_address' %]
30
    [% PROCESS 'address-style_streetnumber' %]
31
        [% PROCESS 'address-style_streetnumber' %]
31
    [% PROCESS 'address-style_address2' %]
32
        [% PROCESS 'address-style_address2' %]
32
    [% PROCESS 'address-style_zipcode' %]
33
        [% PROCESS 'address-style_zipcode' %]
33
    [% PROCESS 'address-style_city' %]
34
        [% PROCESS 'address-style_city' %]
34
    [% PROCESS 'address-style_state' %]
35
        [% PROCESS 'address-style_state' %]
35
    [% PROCESS 'address-style_country' %]
36
        [% PROCESS 'address-style_country' %]
36
[% END %]
37
    [% END %]
37
38
38
[% BLOCK 'member-main-address-style-fr' %]
39
    [% BLOCK 'member-main-address-style-fr' %]
39
    [% PROCESS 'address-style_streetnumber' %]
40
        [% PROCESS 'address-style_streetnumber' %]
40
    [% PROCESS 'address-style_roadtypes' %]
41
        [% PROCESS 'address-style_roadtypes' %]
41
    [% PROCESS 'address-style_address' %]
42
        [% PROCESS 'address-style_address' %]
42
    [% PROCESS 'address-style_address2' %]
43
        [% PROCESS 'address-style_address2' %]
43
    [% PROCESS 'address-style_zipcode' %]
44
        [% PROCESS 'address-style_zipcode' %]
44
    [% PROCESS 'address-style_city' %]
45
        [% PROCESS 'address-style_city' %]
45
    [% PROCESS 'address-style_state' %]
46
        [% PROCESS 'address-style_state' %]
46
    [% PROCESS 'address-style_country' %]
47
        [% PROCESS 'address-style_country' %]
47
[% END %]
48
    [% END %]
48
49
49
[% BLOCK 'address-style_roadtypes' %]
50
    [% BLOCK 'address-style_roadtypes' %]
50
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
51
        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
51
    [% IF roadtypes.count %]
52
        [% IF roadtypes.count %]
52
        [% UNLESS nostreettype %]
53
            [% UNLESS nostreettype %]
54
                <li>
55
                    [% IF ( mandatorystreettype ) %]
56
                        <label for="streettype" class="required">
57
                    [% ELSE %]
58
                        <label for="streettype">
59
                    [% END %]
60
                    Street type: </label>
61
                    <select name="streettype">
62
                        <option value=""></option>
63
                        [% FOR roadtype IN roadtypes %]
64
                            [% IF roadtype.authorised_value == patron.streettype %]
65
                                <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
66
                            [% ELSE %]
67
                                <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
68
                            [% END %]
69
                        [% END %]
70
                    </select>
71
                    [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
72
                </li>
73
            [% END %]
74
        [% END %]
75
    [% END %]
76
77
    [% BLOCK 'address-style_address' %]
78
        [% UNLESS noaddress %]
53
            <li>
79
            <li>
54
                [% IF ( mandatorystreettype ) %]
80
                [% IF ( mandatoryaddress ) %]
55
                    <label for="streettype" class="required">
81
                    <label for="address" class="required">
56
                [% ELSE %]
82
                [% ELSE %]
57
                    <label for="streettype">
83
                    <label for="address">
58
                [% END %]
84
                [% END %]
59
                Street type: </label>
85
                Address: </label>
60
                <select name="streettype">
86
                <input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" />
61
                    <option value=""></option>
87
            [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
62
                    [% FOR roadtype IN roadtypes %]
63
                        [% IF roadtype.authorised_value == patron.streettype %]
64
                            <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
65
                        [% ELSE %]
66
                            <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
67
                        [% END %]
68
                    [% END %]
69
                </select>
70
                [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
71
            </li>
88
            </li>
72
        [% END %]
89
        [% END %]
73
    [% END %]
90
    [% END %]
74
[% END %]
75
91
76
[% BLOCK 'address-style_address' %]
92
    [% BLOCK 'address-style_streetnumber' %]
77
    [% UNLESS noaddress %]
93
        [% UNLESS nostreetnumber %]
78
        <li>
94
            <li>
79
            [% IF ( mandatoryaddress ) %]
95
                [% IF ( mandatorystreetnumber ) %]
80
                <label for="address" class="required">
96
                    <label for="streetnumber" class="required">
81
            [% ELSE %]
97
                [% ELSE %]
82
                <label for="address">
98
                    <label for="streetnumber">
83
            [% END %]
99
                [% END %]
84
            Address: </label>
100
                Street number: </label>
85
            <input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" />
101
                <input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" />
86
          [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
102
                [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
87
        </li>
103
            </li>
88
    [% END %]
104
        [% END %]
89
[% END %]
90
91
[% BLOCK 'address-style_streetnumber' %]
92
    [% UNLESS nostreetnumber %]
93
        <li>
94
            [% IF ( mandatorystreetnumber ) %]
95
                <label for="streetnumber" class="required">
96
            [% ELSE %]
97
                <label for="streetnumber">
98
            [% END %]
99
            Street number: </label>
100
            <input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" />
101
            [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
102
        </li>
103
    [% END %]
105
    [% END %]
104
[% END %]
105
106
106
[% BLOCK 'address-style_address2' %]
107
    [% BLOCK 'address-style_address2' %]
107
    [% UNLESS noaddress2 %]
108
        [% UNLESS noaddress2 %]
108
        <li>
109
            <li>
109
            [% IF ( mandatoryaddress2 ) %]
110
                [% IF ( mandatoryaddress2 ) %]
110
                <label for="address2" class="required">
111
                    <label for="address2" class="required">
111
            [% ELSE %]
112
                [% ELSE %]
112
                <label for="address2">
113
                    <label for="address2">
113
            [% END %]
114
                [% END %]
114
            Address 2: </label>
115
                Address 2: </label>
115
            <input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" />
116
                <input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" />
116
            [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
117
                [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
117
        </li>
118
            </li>
119
        [% END %]
118
    [% END %]
120
    [% END %]
119
[% END %]
120
121
121
[% BLOCK 'address-style_zipcode' %]
122
    [% BLOCK 'address-style_zipcode' %]
122
    [% UNLESS nozipcode %]
123
        [% UNLESS nozipcode %]
123
        <li>
124
            <li>
124
            [% IF ( mandatoryzipcode ) %]
125
                [% IF ( mandatoryzipcode ) %]
125
                <label for="zipcode" class="required">
126
                    <label for="zipcode" class="required">
126
            [% ELSE %]
127
                [% ELSE %]
127
                <label for="zipcode">
128
                    <label for="zipcode">
128
            [% END %]
129
                [% END %]
129
            ZIP/Postal code: </label>
130
                ZIP/Postal code: </label>
130
            <input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" />
131
                <input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" />
131
              [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
132
                [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
132
        </li>
133
            </li>
134
        [% END %]
133
    [% END %]
135
    [% END %]
134
[% END %]
135
136
136
[% BLOCK 'address-style_city' %]
137
    [% BLOCK 'address-style_city' %]
137
    [% UNLESS nocity %]
138
        [% UNLESS nocity %]
138
        <li>
139
            <li>
139
            [% IF ( mandatorycity ) %]
140
                [% IF ( mandatorycity ) %]
140
                <label for="city" class="required" >
141
                    <label for="city" class="required" >
141
            [% ELSE %]
142
                [% ELSE %]
142
                <label for="city">
143
                    <label for="city">
143
            [% END %]
144
                [% END %]
144
            City: </label>
145
                City: </label>
145
            [% IF cities.count %]
146
                [% IF cities.count %]
146
                <select class="select_city" data-addressfield="" name="select_city">
147
                    <select class="select_city" data-addressfield="" name="select_city">
147
                    <option value="|||"></option>
148
                        <option value="|||"></option>
148
                    [% FOREACH c IN cities %]
149
                        [% FOREACH c IN cities %]
149
                        [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
150
                            [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
150
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
151
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
151
                        [% ELSE %]
152
                            [% ELSE %]
152
                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
153
                            <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
154
                            [% END %]
155
                                [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
156
                            </option>
153
                        [% END %]
157
                        [% END %]
154
                            [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
158
                    </select>
155
                        </option>
159
                    <span class="hint">or enter</span>
156
                    [% END %]
160
                [% END %]
157
                </select>
161
                <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
158
                <span class="hint">or enter</span>
162
                [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
159
            [% END %]
163
            </li>
160
            <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
164
        [% END %]
161
            [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
162
        </li>
163
    [% END %]
165
    [% END %]
164
[% END %]
165
166
166
[% BLOCK 'address-style_state' %]
167
    [% BLOCK 'address-style_state' %]
167
    [% UNLESS nostate %]
168
        [% UNLESS nostate %]
168
        <li>
169
            <li>
169
            [% IF ( mandatorystate ) %]
170
                [% IF ( mandatorystate ) %]
170
                <label for="state" class="required" >
171
                    <label for="state" class="required" >
171
            [% ELSE %]
172
                [% ELSE %]
172
                <label for="state">
173
                    <label for="state">
173
            [% END %]
174
                [% END %]
174
            State: </label>
175
                State: </label>
175
            <input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" />
176
                <input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" />
176
            [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
177
                [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
177
        </li>
178
            </li>
179
        [% END %]
178
    [% END %]
180
    [% END %]
179
[% END %]
180
181
181
[% BLOCK 'address-style_country' %]
182
    [% BLOCK 'address-style_country' %]
182
    [% UNLESS nocountry %]
183
        [% UNLESS nocountry %]
183
        <li>
184
            <li>
184
            [% IF ( mandatorycountry ) %]
185
                [% IF ( mandatorycountry ) %]
185
                <label for="country" class="required">
186
                    <label for="country" class="required">
186
            [% ELSE %]
187
                [% ELSE %]
187
                <label for="country">
188
                    <label for="country">
188
            [% END %]
189
                [% END %]
189
            Country: </label>
190
                Country: </label>
190
            <input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" />
191
                <input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" />
191
            [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
192
                [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
192
        </li>
193
            </li>
194
        [% END %]
193
    [% END %]
195
    [% END %]
194
[% END %]
196
[% END # /FILTER collapse %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc (-80 / +81 lines)
Lines 1-81 Link Here
1
[%~ USE Koha ~%]
1
[% USE Koha %]
2
[%~ USE raw ~%]
2
[% USE raw %]
3
[%~ BLOCK 'display-library-address' ~%]
3
[% FILTER collapse %]
4
    [%~ SET line_break = "<br/>" ~%]
4
    [% BLOCK 'display-library-address' %]
5
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
5
        [% SET line_break = "<br/>" %]
6
    [%~ IF Koha.Preference( 'AddressFormat' ) == "us" ~%]
6
        [% IF no_line_break %][% SET line_break = " " %][% END %]
7
        [%~ PROCESS 'display-library-address-us' ~%]
7
        [% IF Koha.Preference( 'AddressFormat' ) == "us" %]
8
    [%~ ELSE ~%]
8
            [% PROCESS 'display-library-address-us' %]
9
        [%~ PROCESS 'display-library-address-de-fr' ~%]
9
        [% ELSE %]
10
    [%~ END ~%]
10
            [% PROCESS 'display-library-address-de-fr' %]
11
[%~ END ~%]
11
        [% END %]
12
    [% END %]
12
13
13
[%~ BLOCK 'display-library-address-us' ~%]
14
    [% BLOCK 'display-library-address-us' %]
14
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
15
        [% IF ( library.branchaddress1 or library.branchaddress2 ) %]
15
        <span property="streetAddress">
16
            <span property="streetAddress">
16
            [%~ IF ( library.branchaddress1 ) ~%]
17
                [% IF ( library.branchaddress1 ) %]
17
                <div class="branchaddress1">
18
                    <div class="branchaddress1">
18
                    [% library.branchaddress1 | html %]
19
                        [% library.branchaddress1 | html %]
19
                </div>
20
                    </div>
20
            [%~ END ~%]
21
                [% END %]
21
            [%~ IF ( library.branchaddress2 ) ~%]
22
                [% IF ( library.branchaddress2 ) %]
22
                <div class="branchaddress2">
23
                    <div class="branchaddress2">
23
                    [%~ library.branchaddress2 |html  ~%]
24
                        [% library.branchaddress2 |html  %]
24
                </div>
25
                    </div>
25
            [%~ END ~%]
26
                [% END %]
26
            [%~ IF ( library.branchaddress3 ) ~%]
27
                [% IF ( library.branchaddress3 ) %]
27
                <span class="branchaddress3">
28
                    <span class="branchaddress3">
28
                    [%~ library.branchaddress3 | html ~%]
29
                        [% library.branchaddress3 | html %]
29
                </span>
30
                    </span>
30
                [% line_break | $raw %]
31
                    [% line_break | $raw %]
31
            [%~ END ~%]
32
                [% END %]
32
        </span>
33
            </span>
33
    [%~ END ~%]
34
        [% END %]
34
    [%~ IF ( library.branchcity ) ~%]
35
        [% IF ( library.branchcity ) %]
35
        <div class="branchcity">
36
            <div class="branchcity">
36
            <span property="addressLocality">[%~ library.branchcity |html  ~%]</span>
37
                <span property="addressLocality">[% library.branchcity |html  %]</span>
37
            [%~ IF ( library.branchstate ) %]<span property="addressRegion">, [% library.branchstate |html  ~%]</span>[%~ END ~%]
38
                [% IF ( library.branchstate ) %]<span property="addressRegion">, [% library.branchstate |html  %]</span>[% END %]
38
            [%~ IF ( library.branchzip ) %]
39
                [% IF ( library.branchzip ) %]
39
                <span property="postalCode">
40
                    <span property="postalCode">
40
                    [%~ library.branchzip |html  ~%]
41
                        [% library.branchzip |html  %]
41
                </span>
42
                    </span>
42
            [%~ END ~%]
43
                [% END %]
43
            [%~ IF ( library.branchcountry ) %]
44
                [% IF ( library.branchcountry ) %]
44
                <div property="addressCountry">
45
                    <div property="addressCountry">
45
                    [% library.branchcountry |html  ~%]
46
                        [% library.branchcountry |html  %]
46
                </div>
47
                    </div>
47
            [%~ END ~%]
48
                [% END %]
48
        </div>
49
            </div>
49
    [%~ END ~%]
50
        [% END %]
50
[%~ END ~%]
51
    [% END %]
51
52
52
[%~ BLOCK 'display-library-address-de-fr' ~%]
53
    [% BLOCK 'display-library-address-de-fr' %]
53
    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
54
        [% IF ( library.branchaddress1 or library.branchaddress2 ) %]
54
        <span property="streetAddress">
55
            <span property="streetAddress">
55
            [%~ IF ( library.branchaddress1 ) ~%]
56
                [% IF ( library.branchaddress1 ) %]
56
                <span class="branchaddress1">
57
                    <span class="branchaddress1">
57
                    [%~ library.branchaddress1 | html ~%]
58
                        [% library.branchaddress1 | html %]
58
                </span>
59
                    </span>
59
                [% line_break | $raw %]
60
                    [% line_break | $raw %]
60
            [%~ END ~%]
61
                [% END %]
61
            [%~ IF ( library.branchaddress2 ) ~%]
62
                [% IF ( library.branchaddress2 ) %]
62
                <span class="branchaddress2">
63
                    <span class="branchaddress2">
63
                    [%~ library.branchaddress2 | html ~%]
64
                        [% library.branchaddress2 | html %]
64
                </span>
65
                    </span>
65
                [% line_break | $raw %]
66
                    [% line_break | $raw %]
66
            [%~ END ~%]
67
                [% END %]
67
            [%~ IF ( library.branchaddress3 ) ~%]
68
                [% IF ( library.branchaddress3 ) %]
68
                <span class="branchaddress3">
69
                    <span class="branchaddress3">
69
                    [%~ library.branchaddress3 | html ~%]
70
                        [% library.branchaddress3 | html %]
70
                </span>
71
                    </span>
71
                [% line_break | $raw %]
72
                    [% line_break | $raw %]
72
            [%~ END ~%]
73
                [% END %]
73
        </span>
74
            </span>
74
    [%~ END ~%]
75
        [% END %]
75
    [%~ IF ( library.branchcity ) ~%]
76
        [% IF ( library.branchcity ) %]
76
        <span class="branchcity">
77
            <span class="branchcity">
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 ~%]
78
                [% 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 %]
78
            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%]
79
                [% IF ( library.branchcountry ) %][% line_break | $raw %]<span property="addressCountry">[% library.branchcountry | html %]</span>[% END %]
79
        </span>
80
            </span>
80
    [%~ END ~%]
81
        [% END %]
81
[%~ END ~%]
82
    [% END %]
83
[% END # /FILTER collapse %]
82
- 

Return to bug 36171