Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 25070: Centralize member-main-address-style

Browse source 
Signed-off-by: David Nind <david@davidnind.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2020-04-06 14:42:40 +02:00
parent ac973d2d44
commit 4a4d3ef0d8
6 changed files with 193 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
View file

@ -102,7 +102,7 @@
<label for="B_streetnumber">
[% END %]
Street Number: </label>
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber | html %]" />
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber | html %]" />
[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

125
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
View file

@ -1,125 +0,0 @@
<fieldset class="rows" id="memberentry_mainaddress">
<legend id="main_address_lgd">Main address</legend><ol>
[% UNLESS nostreettype %]
[% 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 %]
[% 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="35" value="[% patron.address | html %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% 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 %]
[% 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="35" value="[% patron.address2 | html %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nozipcode %]
<li>
[% IF ( mandatoryzipcode ) %]
<label for="zipcode" class="required">
[% ELSE %]
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode | html %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocity %]
<li>
[% IF ( mandatorycity ) %]
<label for="city" class="required">
[% ELSE %]
<label for="city">
[% END %]
City: </label>
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
[% IF cities.count %]or choose
<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>
[% END %]
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nostate %]
<li>
[% IF ( mandatorystate ) %]
<label for="state" class="required">
[% ELSE %]
<label for="state">
[% END %]
State: </label>
<input type="text" name="state" id="state" size="20" value="[% patron.state | html %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocountry %]
<li>
[% IF ( mandatorycountry ) %]
<label for="country" class="required">
[% ELSE %]
<label for="country">
[% END %]
Country: </label>
<input type="text" name="country" id="country" size="20" value="[% patron.country | html %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
</ol>
</fieldset>

126
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
View file

@ -1,126 +0,0 @@
<fieldset class="rows" id="memberentry_mainaddress">
<legend id="main_address_lgd">Main address</legend><ol>
[% UNLESS nostreettype %]
[% 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 %]
[% 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 %]
[% 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="35" value="[% patron.address | html %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% 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="35" value="[% patron.address2 | html %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nozipcode %]
<li>
[% IF ( mandatoryzipcode ) %]
<label for="zipcode" class="required">
[% ELSE %]
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode | html %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocity %]
<li>
[% IF ( mandatorycity ) %]
<label for="city" class="required">
[% ELSE %]
<label for="city">
[% END %]
City: </label>
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
[% IF cities.count %]or choose
<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>
[% END %]
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nostate %]
<li>
[% IF ( mandatorystate ) %]
<label for="state" class="required">
[% ELSE %]
<label for="state">
[% END %]
State: </label>
<input type="text" name="state" id="state" size="20" value="[% patron.state | html %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocountry %]
<li>
[% IF ( mandatorycountry ) %]
<label for="country" class="required">
[% ELSE %]
<label for="country">
[% END %]
Country: </label>
<input type="text" name="country" id="country" size="20" value="[% patron.country | html %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
</ol>
</fieldset>

125
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
View file

@ -1,125 +0,0 @@
<fieldset class="rows" id="memberentry_mainaddress">
<legend id="main_address_lgd">Main address</legend><ol>
[% 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 %]
[% UNLESS nostreettype %]
[% 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 %]
[% 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="35" value="[% patron.address | html %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% 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="35" value="[% patron.address2 | html %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocity %]
<li>
[% IF ( mandatorycity ) %]
<label for="city" class="required">
[% ELSE %]
<label for="city">
[% END %]
City: </label>
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
[% IF cities.count %]or choose
<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>
[% END %]
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nostate %]
<li>
[% IF ( mandatorystate ) %]
<label for="state" class="required">
[% ELSE %]
<label for="state">
[% END %]
State: </label>
<input type="text" name="state" id="state" size="20" value="[% patron.state | html %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nozipcode %]
<li>
[% IF ( mandatoryzipcode ) %]
<label for="zipcode" class="required">
[% ELSE %]
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode | html %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% UNLESS nocountry %]
<li>
[% IF ( mandatorycountry ) %]
<label for="country" class="required">
[% ELSE %]
<label for="country">
[% END %]
Country: </label>
<input type="text" name="country" id="country" size="20" value="[% patron.country | html %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
</ol>
</fieldset>

190
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc Normal file
View file

@ -0,0 +1,190 @@
[% 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 ( mandatorystreetype ) %]
<label for="streetype" class="required">
[% ELSE %]
<label for="streetype">
[% END %]
Street type: </label>
<select name="streetype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == patron.streetype %]
<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 ( mandatorystreetype ) %]<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>
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
[% IF cities.count %]
or choose
<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>
[% END %]
[% 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 %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
View file

@ -5,6 +5,7 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% PROCESS 'member-main-address-style.inc' %]
[% PROCESS 'member-alt-address-style.inc' %]
[% PROCESS 'member-alt-contact-style.inc' %]
[% SET footerjs = 1 %]
@ -572,11 +573,7 @@ legend:hover {
[% END # /IF show_guarantor || guarantor %]
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-main-address-style-us.inc' %]
[% END %]
[% PROCESS 'main-address-style' %]
[% END # /UNLESS nostreet && nocity etc group%]
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]