Attachment #104663 for bug #25070

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

Lines 102-108 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc (-1 / +1 lines)
102	<label for="B_streetnumber">	102	<label for="B_streetnumber">
103	[% END %]	103	[% END %]
104	Street Number: </label>	104	Street Number: </label>
105	<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber \| html %]" />	105	<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber \| html %]" />
106	[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]	106	[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
107	</li>	107	</li>
108	[% END %]	108	[% END %]




<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>




<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>




<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>




[% 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 %]




[% 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 %]

                                [% END # /IF show_guarantor || guarantor  %]

                                [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
                                    [% PROCESS 'main-address-style' %]
                                        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
                                    [% ELSE %]
                                        [% INCLUDE 'member-main-address-style-us.inc' %]
                                    [% END %]
                                [% END # /UNLESS nostreet && nocity etc group%]

                                [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
- 

Return to bug 25070

Lines 1-125 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc (-125 lines)
1	<fieldset class="rows" id="memberentry_mainaddress">
2	<legend id="main_address_lgd">Main address</legend><ol>
3	[% UNLESS nostreettype %]
4	[% IF roadtypes %]
5	<li>
6	[% IF ( mandatorystreettype ) %]
7	<label for="streettype" class="required">
8	[% ELSE %]
9	<label for="streettype">
10	[% END %]
11	Street type: </label>
12	<select name="streettype">
13	<option value=""></option>
14	[% FOR roadtype IN roadtypes %]
15	[% IF roadtype.authorised_value == patron.streettype %]
16	<option value="[% roadtype.authorised_value \| html %]" selected="selected">[% roadtype.lib \| html %]</option>
17	[% ELSE %]
18	<option value="[% roadtype.authorised_value \| html %]">[% roadtype.lib \| html %]</option>
19	[% END %]
20	[% END %]
21	</select>
22	[% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
23	</li>
24	[% END %]
25	[% END %]
26	[% UNLESS noaddress %]
27	<li>
28	[% IF ( mandatoryaddress ) %]
29	<label for="address" class="required">
30	[% ELSE %]
31	<label for="address">
32	[% END %]
33	Address: </label>
34	<input type="text" id="address" name="address" size="35" value="[% patron.address \| html %]" />
35	[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
36	</li>
37	[% END %]
38	[% UNLESS nostreetnumber %]
39	<li>
40	[% IF ( mandatorystreetnumber ) %]
41	<label for="streetnumber" class="required">
42	[% ELSE %]
43	<label for="streetnumber">
44	[% END %]
45	Street number: </label>
46	<input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber \| html %]" />
47	[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
48	</li>
49	[% END %]
50	[% UNLESS noaddress2 %]
51	<li>
52	[% IF ( mandatoryaddress2 ) %]
53	<label for="address2" class="required">
54	[% ELSE %]
55	<label for="address2">
56	[% END %]
57	Address 2: </label>
58	<input type="text" id="address2" name="address2" size="35" value="[% patron.address2 \| html %]" />
59	[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60	</li>
61	[% END %]
62	[% UNLESS nozipcode %]
63	<li>
64	[% IF ( mandatoryzipcode ) %]
65	<label for="zipcode" class="required">
66	[% ELSE %]
67	<label for="zipcode">
68	[% END %]
69	ZIP/Postal code: </label>
70	<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode \| html %]" />
71	[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
72	</li>
73	[% END %]
74	[% UNLESS nocity %]
75	<li>
76	[% IF ( mandatorycity ) %]
77	<label for="city" class="required">
78	[% ELSE %]
79	<label for="city">
80	[% END %]
81	City: </label>
82	<input type="text" id="city" name="city" size="20" value="[% patron.city \| html %]" />
83	[% IF cities.count %]or choose
84	<select class="select_city" data-addressfield="" name="select_city">
85	<option value="\|\|\|"></option>
86	[% FOREACH c IN cities %]
87	[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
88	<option value="[% c.city_zipcode \| html %]\|[% c.city_name \| html %]\|[% c.city_state \| html %]\|[% c.city_country \| html %]" selected="selected">
89	[% ELSE %]
90	<option value="[% c.city_zipcode \| html %]\|[% c.city_name \| html %]\|[% c.city_state \| html %]\|[% c.city_country \| html %]">
91	[% END %]
92	[% c.city_name \| html %] [% c.city_state \| html %] [% c.city_zipcode \| html %]
93	</option>
94	[% END %]
95	</select>
96	[% END %]
97	[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
98	</li>
99	[% END %]
100	[% UNLESS nostate %]
101	<li>
102	[% IF ( mandatorystate ) %]
103	<label for="state" class="required">
104	[% ELSE %]
105	<label for="state">
106	[% END %]
107	State: </label>
108	<input type="text" name="state" id="state" size="20" value="[% patron.state \| html %]" />
109	[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
110	</li>
111	[% END %]
112	[% UNLESS nocountry %]
113	<li>
114	[% IF ( mandatorycountry ) %]
115	<label for="country" class="required">
116	[% ELSE %]
117	<label for="country">
118	[% END %]
119	Country: </label>
120	<input type="text" name="country" id="country" size="20" value="[% patron.country \| html %]" />
121	[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
122	</li>
123	[% END %]
124	</ol>
125	</fieldset>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc (+190 lines)
		1	[% USE Koha %]
		2	[% BLOCK 'main-address-style' %]
		3	<fieldset class="rows" id="memberentry_mainaddress">
		4	<legend id="main_address_lgd">Main address</legend>
		5	<ol>
		6	[% IF Koha.Preference( 'AddressFormat' ) %]
		7	[% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
		8	[% ELSE %]
		9	[% PROCESS 'member-main-address-style-us' %]
		10	[% END %]
		11	</ol>
		12	</fieldset>
		13	[% END %]
		14
		15	[% BLOCK 'member-main-address-style-us' %]
		16	[% PROCESS 'address-style_streetnumber' %]
		17	[% PROCESS 'address-style_roadtypes' %]
		18	[% PROCESS 'address-style_address' %]
		19	[% PROCESS 'address-style_address2' %]
		20	[% PROCESS 'address-style_city' %]
		21	[% PROCESS 'address-style_state' %]
		22	[% PROCESS 'address-style_zipcode' %]
		23	[% PROCESS 'address-style_country' %]
		24	[% END %]
		25
		26	[% BLOCK 'member-main-address-style-de' %]
		27	[% PROCESS 'address-style_roadtypes' %]
		28	[% PROCESS 'address-style_address' %]
		29	[% PROCESS 'address-style_streetnumber' %]
		30	[% PROCESS 'address-style_address2' %]
		31	[% PROCESS 'address-style_zipcode' %]
		32	[% PROCESS 'address-style_city' %]
		33	[% PROCESS 'address-style_state' %]
		34	[% PROCESS 'address-style_country' %]
		35	[% END %]
		36
		37	[% BLOCK 'member-main-address-style-fr' %]
		38	[% PROCESS 'address-style_streetnumber' %]
		39	[% PROCESS 'address-style_roadtypes' %]
		40	[% PROCESS 'address-style_address' %]
		41	[% PROCESS 'address-style_address2' %]
		42	[% PROCESS 'address-style_zipcode' %]
		43	[% PROCESS 'address-style_city' %]
		44	[% PROCESS 'address-style_state' %]
		45	[% PROCESS 'address-style_country' %]
		46	[% END %]
		47
		48	[% BLOCK 'address-style_roadtypes' %]
		49	[% IF roadtypes %]
		50	<li>
		51	[% IF ( mandatorystreetype ) %]
		52	<label for="streetype" class="required">
		53	[% ELSE %]
		54	<label for="streetype">
		55	[% END %]
		56	Street type: </label>
		57	<select name="streetype">
		58	<option value=""></option>
		59	[% FOR roadtype IN roadtypes %]
		60	[% IF roadtype.authorised_value == patron.streetype %]
		61	<option value="[% roadtype.authorised_value \| html %]" selected="selected">[% roadtype.lib \| html %]</option>
		62	[% ELSE %]
		63	<option value="[% roadtype.authorised_value \| html %]">[% roadtype.lib \| html %]</option>
		64	[% END %]
65	[% END %]
66	</select>
67	[% IF ( mandatorystreetype ) %]<span class="required">Required</span>[% END %]
68	</li>
69	[% END %]
70	[% END %]
71
72	[% BLOCK 'address-style_address' %]
73	[% UNLESS noaddress %]
74	<li>
75	[% IF ( mandatoryaddress ) %]
76	<label for="address" class="required">
77	[% ELSE %]
78	<label for="address">
79	[% END %]
80	Address: </label>
81	<input type="text" id="address" name="address" size="40" value="[% patron.address \| html %]" />
82	[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
83	</li>
84	[% END %]
85	[% END %]
86
87	[% BLOCK 'address-style_streetnumber' %]
88	[% UNLESS nostreetnumber %]
89	<li>
90	[% IF ( mandatorystreetnumber ) %]
91	<label for="streetnumber" class="required">
92	[% ELSE %]
93	<label for="streetnumber">
94	[% END %]
95	Street Number: </label>
96	<input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber \| html %]" />
97	[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
98	</li>
99	[% END %]
100	[% END %]
101
102	[% BLOCK 'address-style_address2' %]
103	[% UNLESS noaddress2 %]
104	<li>
105	[% IF ( mandatoryaddress2 ) %]
106	<label for="address2" class="required">
107	[% ELSE %]
108	<label for="address2">
109	[% END %]
110	Address 2: </label>
111	<input type="text" id="address2" name="address2" size="40" value="[% patron.address2 \| html %]" />
112	[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
113	</li>
114	[% END %]
115	[% END %]
116
117	[% BLOCK 'address-style_zipcode' %]
118	[% UNLESS nozipcode %]
119	<li>
120	[% IF ( mandatoryzipcode ) %]
121	<label for="zipcode" class="required">
122	[% ELSE %]
123	<label for="zipcode">
124	[% END %]
125	ZIP/Postal code: </label>
126	<input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode \| html %]" />
127	[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
128	</li>
129	[% END %]
130	[% END %]
131
132	[% BLOCK 'address-style_city' %]
133	[% UNLESS nocity %]
134	<li>
135	[% IF ( mandatorycity ) %]
136	<label for="city" class="required" >
137	[% ELSE %]
138	<label for="city">
139	[% END %]
140	City: </label>
141	<input type="text" id="city" name="city" size="20" value="[% patron.city \| html %]" />
142	[% IF cities.count %]
143	or choose
144	<select class="select_city" data_addressfield="" name="select_city">
145	<option value="\|\|\|"></option>
146	[% FOREACH c IN cities %]
147	[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
148	<option value="[% c.city_zipcode \| html %]\|[% c.city_name \| html %]\|[% c.city_state \| html %]\|[% c.city_country \| html %]" selected="selected">
149	[% ELSE %]
150	<option value="[% c.city_zipcode \| html %]\|[% c.city_name \| html %]\|[% c.city_state \| html %]\|[% c.city_country \| html %]">
151	[% END %]
152	[% c.city_name \| html %] [% c.city_state \| html %] [% c.city_zipcode \| html %]
153	</option>
154	[% END %]
155	</select>
156	[% END %]
157	[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
158	</li>
159	[% END %]
160	[% END %]
161
162	[% BLOCK 'address-style_state' %]
163	[% UNLESS nostate %]
164	<li>
165	[% IF ( mandatorystate ) %]
166	<label for="state" class="required" >
167	[% ELSE %]
168	<label for="state">
169	[% END %]
170	State: </label>
171	<input type="text" id="state" name="state" size="20" value="[% patron.state \| html %]" />
172	[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
173	</li>
174	[% END %]
175	[% END %]
176
177	[% BLOCK 'address-style_country' %]
178	[% UNLESS nocountry %]
179	<li>
180	[% IF ( mandatorycountry ) %]
181	<label for="country" class="required">
182	[% ELSE %]
183	<label for="country">
184	[% END %]
185	Country: </label>
186	<input type="text" id="country" name="country" size="20" value="[% patron.country \| html %]" />
187	[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
188	</li>
189	[% END %]
190	[% END %]

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-6 / +2 lines)
5	[% USE Koha %]	5	[% USE Koha %]
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% USE Branches %]	7	[% USE Branches %]
		8	[% PROCESS 'member-main-address-style.inc' %]
8	[% PROCESS 'member-alt-address-style.inc' %]	9	[% PROCESS 'member-alt-address-style.inc' %]
9	[% PROCESS 'member-alt-contact-style.inc' %]	10	[% PROCESS 'member-alt-contact-style.inc' %]
10	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
Lines 572-582 legend:hover { Link Here
572	[% END # /IF show_guarantor \|\| guarantor %]	573	[% END # /IF show_guarantor \|\| guarantor %]
573		574
574	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]	575	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
575	[% IF Koha.Preference( 'AddressFormat' ) %]	576	[% PROCESS 'main-address-style' %]
576	[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
577	[% ELSE %]
578	[% INCLUDE 'member-main-address-style-us.inc' %]
579	[% END %]
580	[% END # /UNLESS nostreet && nocity etc group%]	577	[% END # /UNLESS nostreet && nocity etc group%]
581		578
582	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]	579	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
583	-