Koha/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
Fridolin Somers 5a66924914 Bug 26538: Display cities list before input text
In patron creation or edition actually the city field is displayed with input text then cities list.
I propose to display cities list first since it is more likely used.

Test plan :
1) Create some cities
2) Open patron creation form
3) Check you see for each city field : cities list, text "or enter", text input
4) Delete all cities
5) Open patron creation form
6) Check you see for each city field : only text input

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-10-14 11:47:57 +02:00

190 lines
7.2 KiB
HTML

[% USE Koha %]
[% BLOCK 'main-address-style' %]
<fieldset class="rows" id="memberentry_mainaddress">
<legend id="main_address_lgd">Main address</legend>
<ol>
[% IF Koha.Preference( 'AddressFormat' ) %]
[% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
[% ELSE %]
[% PROCESS 'member-main-address-style-us' %]
[% END %]
</ol>
</fieldset>
[% END %]
[% BLOCK 'member-main-address-style-us' %]
[% PROCESS 'address-style_streetnumber' %]
[% PROCESS 'address-style_roadtypes' %]
[% PROCESS 'address-style_address' %]
[% PROCESS 'address-style_address2' %]
[% PROCESS 'address-style_city' %]
[% PROCESS 'address-style_state' %]
[% PROCESS 'address-style_zipcode' %]
[% PROCESS 'address-style_country' %]
[% END %]
[% BLOCK 'member-main-address-style-de' %]
[% PROCESS 'address-style_roadtypes' %]
[% PROCESS 'address-style_address' %]
[% PROCESS 'address-style_streetnumber' %]
[% PROCESS 'address-style_address2' %]
[% PROCESS 'address-style_zipcode' %]
[% PROCESS 'address-style_city' %]
[% PROCESS 'address-style_state' %]
[% PROCESS 'address-style_country' %]
[% END %]
[% BLOCK 'member-main-address-style-fr' %]
[% PROCESS 'address-style_streetnumber' %]
[% PROCESS 'address-style_roadtypes' %]
[% PROCESS 'address-style_address' %]
[% PROCESS 'address-style_address2' %]
[% PROCESS 'address-style_zipcode' %]
[% PROCESS 'address-style_city' %]
[% PROCESS 'address-style_state' %]
[% PROCESS 'address-style_country' %]
[% END %]
[% BLOCK 'address-style_roadtypes' %]
[% IF roadtypes %]
<li>
[% IF ( mandatorystreettype ) %]
<label for="streettype" class="required">
[% ELSE %]
<label for="streettype">
[% END %]
Street type: </label>
<select name="streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == patron.streettype %]
<option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
[% END %]
[% END %]
</select>
[% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_address' %]
[% UNLESS noaddress %]
<li>
[% IF ( mandatoryaddress ) %]
<label for="address" class="required">
[% ELSE %]
<label for="address">
[% END %]
Address: </label>
<input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_streetnumber' %]
[% UNLESS nostreetnumber %]
<li>
[% IF ( mandatorystreetnumber ) %]
<label for="streetnumber" class="required">
[% ELSE %]
<label for="streetnumber">
[% END %]
Street number: </label>
<input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" />
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_address2' %]
[% UNLESS noaddress2 %]
<li>
[% IF ( mandatoryaddress2 ) %]
<label for="address2" class="required">
[% ELSE %]
<label for="address2">
[% END %]
Address 2: </label>
<input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_zipcode' %]
[% UNLESS nozipcode %]
<li>
[% IF ( mandatoryzipcode ) %]
<label for="zipcode" class="required">
[% ELSE %]
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_city' %]
[% UNLESS nocity %]
<li>
[% IF ( mandatorycity ) %]
<label for="city" class="required" >
[% ELSE %]
<label for="city">
[% END %]
City: </label>
[% IF cities.count %]
<select class="select_city" data-addressfield="" name="select_city">
<option value="|||"></option>
[% FOREACH c IN cities %]
[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
<option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
[% ELSE %]
<option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
[% END %]
[% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
</option>
[% END %]
</select>
<span class="hint">or enter</span>
[% END %]
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_state' %]
[% UNLESS nostate %]
<li>
[% IF ( mandatorystate ) %]
<label for="state" class="required" >
[% ELSE %]
<label for="state">
[% END %]
State: </label>
<input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'address-style_country' %]
[% UNLESS nocountry %]
<li>
[% IF ( mandatorycountry ) %]
<label for="country" class="required">
[% ELSE %]
<label for="country">
[% END %]
Country: </label>
<input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]