Attachment 104660 Details for Bug 25070 – Bug 25070: Centralize member-alt-contact-style

[patch] Bug 25070: Centralize member-alt-contact-style

Bug-25070-Centralize-member-alt-contact-style.patch (text/plain), 30.94 KB, created by David Nind on 2020-05-11 09:25:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2020-05-11 09:25:39 UTC

Size: 30.94 KB

patch

obsolete

>From 18fc6703135a1adc56c7bd7d8338b8a56edf8571 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 6 Apr 2020 14:09:06 +0200
>Subject: [PATCH] Bug 25070: Centralize member-alt-contact-style
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../en/includes/member-alt-contact-style-de.inc    | 126 -------------
> .../en/includes/member-alt-contact-style-fr.inc    | 126 -------------
> .../en/includes/member-alt-contact-style-us.inc    | 126 -------------
> .../prog/en/includes/member-alt-contact-style.inc  | 198 +++++++++++++++++++++
> .../prog/en/modules/members/memberentrygen.tt      |   7 +-
> 5 files changed, 200 insertions(+), 383 deletions(-)
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>deleted file mode 100644
>index b760addb5a..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>+++ /dev/null
>@@ -1,126 +0,0 @@
>-        <fieldset class="rows" id="memberentry_altaddress">
>-            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>-        [% UNLESS noaltcontactsurname %]
>-            <li>
>-                [% IF ( mandatoryaltcontactsurname ) %]
>-                <label for="altcontactsurname" class="required">
>-                [% ELSE %]
>-                <label for="altcontactsurname">
>-                [% END %]
>-                Surname:</label>
>-                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
>-                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactfirstname %]
>-            <li>
>-                [% IF ( mandatoryaltcontactfirstname ) %]
>-                <label for="altcontactfirstname" class="required">
>-                [% ELSE %]
>-                <label for="altcontactfirstname">
>-                [% END %]
>-                First name:</label>
>-                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
>-                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress1 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress1 ) %]
>-                <label for="altcontactaddress1" class="required">
>-                [% ELSE %]
>-                <label for="altcontactaddress1">
>-                [% END %]
>-                Address:</label>
>-                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress2 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress2 ) %]
>-                <label for="altcontactaddress2" class="required">
>-                [% ELSE %]
>-                <label for="altcontactaddress2">
>-                [% END %]
>-                Address 2:</label>
>-                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactzipcode %]
>-                        <li>
>-                            [% IF ( mandatoryaltcontactzipcode ) %]
>-                                <label for="altcontactzipcode" class="required">
>-                                [% ELSE %]
>-                                <label for="altcontactzipcode">
>-                                [% END %]
>-                                ZIP/Postal code:</label>
>-                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
>-                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>-                        </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress3 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress3 ) %]
>-                <label for="altcontactaddress3" class="required">
>-                [% ELSE %]
>-                <label for="altcontactaddress3">
>-                [% END %]
>-                City:</label>
>-                <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
>-                [% IF cities.count %]or choose
>-                    <select class="select_city" data-addressfield="altcontact" name="select_city">
>-                        <option value="|||"></option>
>-                        [% FOREACH c IN cities %]
>-                            [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
>-                            <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 ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactstate %]
>-            <li>
>-                [% IF ( mandatoryaltcontactstate ) %]
>-                <label for="altcontactstate" class="required">
>-                [% ELSE %]
>-                <label for="altcontactstate">
>-                [% END %]
>-                State:</label>
>-                <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
>-                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactcountry %]
>-            <li>
>-                [% IF ( mandatoryaltcontactcountry ) %]
>-                <label for="altcontactcountry" class="required">
>-                [% ELSE %]
>-                <label for="altcontactcountry">
>-                [% END %]
>-                Country:</label>
>-                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
>-                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactphone %]
>-            <li>
>-                [% IF ( mandatoryaltcontactphone ) %]
>-                <label for="altcontactphone" class="required">
>-                [% ELSE %]
>-                <label for="altcontactphone">
>-                [% END %]
>-                Phone:</label>
>-                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
>-                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-            </ol>
>-        </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
>deleted file mode 100644
>index 333f5a718e..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
>+++ /dev/null
>@@ -1,126 +0,0 @@
>-<fieldset class="rows" id="memberentry_altaddress">
>-    <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>-[% UNLESS noaltcontactsurname %]
>-    <li>
>-    [% IF ( mandatoryaltcontactsurname ) %]
>-        <label for="altcontactsurname" class="required">
>-    [% ELSE %]
>-        <label for="altcontactsurname">
>-    [% END %]
>-    Surname:</label>
>-    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
>-    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactfirstname %]
>-    <li>
>-    [% IF ( mandatoryaltcontactfirstname ) %]
>-        <label for="altcontactfirstname" class="required">
>-    [% ELSE %]
>-        <label for="altcontactfirstname">
>-    [% END %]
>-        First name:</label>
>-        <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
>-    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactaddress1 %]
>-    <li>
>-    [% IF ( mandatoryaltcontactaddress1 ) %]
>-        <label for="altcontactaddress1" class="required">
>-    [% ELSE %]
>-        <label for="altcontactaddress1">
>-    [% END %]
>-    Address:</label>
>-    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
>-    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactaddress2 %]
>-    <li>
>-    [% IF ( mandatoryaltcontactaddress2 ) %]
>-        <label for="altcontactaddress2" class="required">
>-    [% ELSE %]
>-        <label for="altcontactaddress2">
>-    [% END %]
>-    Address 2:</label>
>-    <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
>-    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactzipcode %]
>-    <li>
>-    [% IF ( mandatoryaltcontactzipcode ) %]
>-        <label for="altcontactzipcode" class="required">
>-    [% ELSE %]
>-        <label for="altcontactzipcode">
>-    [% END %]
>-    ZIP/Postal code:</label>
>-    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
>-    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactaddress3 %]
>-    <li>
>-    [% IF ( mandatoryaltcontactaddress3 ) %]
>-        <label for="altcontactcity" class="required">
>-    [% ELSE %]
>-        <label for="altcontactcity">
>-    [% END %]
>-    City:</label>
>-    <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
>-    [% IF cities.count %]or choose
>-        <select class="select_city" data-addressfield="altcontact" name="select_city">
>-            <option value="|||"></option>
>-            [% FOREACH c IN cities %]
>-                [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
>-                <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 ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactstate %]
>-    <li>
>-    [% IF ( mandatoryaltcontactstate ) %]
>-        <label for="altcontactstate" class="required">
>-    [% ELSE %]
>-        <label for="altcontactstate">
>-    [% END %]
>-    State:</label>
>-    <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
>-    [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-[% UNLESS noaltcontactcountry %]
>-    <li>
>-    [% IF ( mandatoryaltcontactcountry ) %]
>-        <label for="altcontactcountry" class="required">
>-    [% ELSE %]
>-        <label for="altcontactcountry">
>-    [% END %]
>-    Country:</label>
>-    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
>-    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>-</li>
>-[% END %]
>-[% UNLESS noaltcontactphone %]
>-    <li>
>-    [% IF ( mandatoryaltcontactphone ) %]
>-        <label for="altcontactphone" class="required">
>-    [% ELSE %]
>-        <label for="altcontactphone">
>-    [% END %]
>-    Phone:</label>
>-    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
>-    [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
>-</ol>
>-</fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
>deleted file mode 100644
>index 5191897f1f..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
>+++ /dev/null
>@@ -1,126 +0,0 @@
>-        <fieldset class="rows" id="memberentry_altaddress">
>-            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>-        [% UNLESS noaltcontactsurname %]
>-            <li>
>-                [% IF ( mandatoryaltcontactsurname ) %]
>-                <label for="altcontactsurname" class="required">
>-                [% ELSE %]
>-                <label for="altcontactsurname">
>-                [% END %]
>-                Surname:</label>
>-                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
>-                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactfirstname %]
>-            <li>
>-                [% IF ( mandatoryaltcontactfirstname ) %]
>-                <label for="altcontactfirstname" class="required">
>-                [% ELSE %]
>-                <label for="altcontactfirstname">
>-                [% END %]
>-                First name:</label>
>-                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
>-                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress1 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress1 ) %]
>-                <label for="altcontactaddress1" class="required">
>-                [% ELSE %]
>-                <label for="altcontactaddress1">
>-                [% END %]
>-                Address:</label>
>-                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress2 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress2 ) %]
>-                <label for="altcontactaddress2" class="required">
>-                [% ELSE %]
>-                <label for="altcontactaddress2">
>-                [% END %]
>-                Address 2:</label>
>-                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactaddress3 %]
>-            <li>
>-                [% IF ( mandatoryaltcontactaddress3 ) %]
>-                <label for="altcontactcity" class="required">
>-                [% ELSE %]
>-                <label for="altcontactcity">
>-                [% END %]
>-                City:</label>
>-                <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
>-                [% IF cities.count %]or choose
>-                    <select class="select_city" data-addressfield="altcontact" name="select_city">
>-                        <option value="|||"></option>
>-                        [% FOREACH c IN cities %]
>-                            [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
>-                            <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 ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactstate %]
>-            <li>
>-                [% IF ( mandatoryaltcontactstate ) %]
>-                <label for="altcontactstate" class="required">
>-                [% ELSE %]
>-                <label for="altcontactstate">
>-                [% END %]
>-                State:</label>
>-                <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
>-                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactzipcode %]
>-            <li>
>-                [% IF ( mandatoryaltcontactzipcode ) %]
>-                <label for="altcontactzipcode" class="required">
>-                [% ELSE %]
>-                <label for="altcontactzipcode">
>-                [% END %]
>-                ZIP/Postal code:</label>
>-                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
>-                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactcountry %]
>-            <li>
>-                [% IF ( mandatoryaltcontactcountry ) %]
>-                <label for="altcontactcountry" class="required">
>-                [% ELSE %]
>-                <label for="altcontactcountry">
>-                [% END %]
>-                Country:</label>
>-                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
>-                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-        [% UNLESS noaltcontactphone %]
>-            <li>
>-                [% IF ( mandatoryaltcontactphone ) %]
>-                <label for="altcontactphone" class="required">
>-                [% ELSE %]
>-                <label for="altcontactphone">
>-                [% END %]
>-                Phone:</label>
>-                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
>-                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>-            </li>
>-        [% END %]
>-            </ol>
>-        </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
>new file mode 100644
>index 0000000000..875699a969
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
>@@ -0,0 +1,198 @@
>+[% USE Koha %]
>+[% BLOCK 'alt-contact-style' %]
>+    <fieldset class="rows" id="memberentry_altaddress">
>+        <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>+        <ol>
>+            [% IF Koha.Preference( 'AddressFormat' ) %]
>+                [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %]
>+            [% ELSE %]
>+                [% PROCESS 'member-alt-contact-style-us' %]
>+            [% END %]
>+        </ol>
>+    </fieldset>
>+[% END %]
>+
>+[% BLOCK 'member-alt-contact-style-us' %]
>+    [% PROCESS 'alt-contact-style_altcontactsurname' %]
>+    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
>+    [% PROCESS 'alt-contact-style_altcontactstate' %]
>+    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
>+    [% PROCESS 'alt-contact-style_altcontactcountry' %]
>+    [% PROCESS 'alt-contact-style_altcontactphone' %]
>+[% END %]
>+
>+[% BLOCK 'member-alt-contact-style-de' %]
>+    [% PROCESS 'alt-contact-style_altcontactsurname' %]
>+    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
>+    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
>+    [% PROCESS 'alt-contact-style_altcontactstate' %]
>+    [% PROCESS 'alt-contact-style_altcontactcountry' %]
>+    [% PROCESS 'alt-contact-style_altcontactphone' %]
>+[% END %]
>+
>+[% BLOCK 'member-alt-contact-style-fr' %]
>+    [% PROCESS 'alt-contact-style_altcontactsurname' %]
>+    [% PROCESS 'alt-contact-style_altcontactfirstname' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress1' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress2' %]
>+    [% PROCESS 'alt-contact-style_altcontactzipcode' %]
>+    [% PROCESS 'alt-contact-style_altcontactaddress3' %]
>+    [% PROCESS 'alt-contact-style_altcontactstate' %]
>+    [% PROCESS 'alt-contact-style_altcontactcountry' %]
>+    [% PROCESS 'alt-contact-style_altcontactphone' %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactsurname' %]
>+    [% UNLESS noaltcontactsurname %]
>+        <li>
>+            [% IF ( mandatoryaltcontactsurname ) %]
>+                <label for="altcontactsurname" class="required">
>+            [% ELSE %]
>+                <label for="altcontactsurname">
>+            [% END %]
>+            Surname:</label>
>+            <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
>+            [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactfirstname' %]
>+    [% UNLESS noaltcontactfirstname %]
>+        <li>
>+            [% IF ( mandatoryaltcontactfirstname ) %]
>+                <label for="altcontactfirstname" class="required">
>+            [% ELSE %]
>+                <label for="altcontactfirstname">
>+            [% END %]
>+            First name:</label>
>+            <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
>+            [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactaddress1' %]
>+    [% UNLESS noaltcontactaddress1 %]
>+        <li>
>+            [% IF ( mandatoryaltcontactaddress1 ) %]
>+                <label for="altcontactaddress1" class="required">
>+            [% ELSE %]
>+                <label for="altcontactaddress1">
>+            [% END %]
>+            Address:</label>
>+            <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
>+            [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactaddress2' %]
>+    [% UNLESS noaltcontactaddress2 %]
>+        <li>
>+            [% IF ( mandatoryaltcontactaddress2 ) %]
>+                <label for="altcontactaddress2" class="required">
>+            [% ELSE %]
>+                <label for="altcontactaddress2">
>+            [% END %]
>+            Address 2:</label>
>+            <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
>+            [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactzipcode' %]
>+    [% UNLESS noaltcontactzipcode %]
>+        <li>
>+            [% IF ( mandatoryaltcontactzipcode ) %]
>+                <label for="altcontactzipcode" class="required">
>+            [% ELSE %]
>+                <label for="altcontactzipcode">
>+            [% END %]
>+            ZIP/Postal code:</label>
>+<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
>+            [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactaddress3' %]
>+    [% UNLESS noaltcontactaddress3 %]
>+        <li>
>+            [% IF ( mandatoryaltcontactaddress3 ) %]
>+                <label for="altcontactaddress3" class="required">
>+            [% ELSE %]
>+                <label for="altcontactaddress3">
>+            [% END %]
>+            City:</label>
>+            <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
>+            [% IF cities.count %]or choose
>+                <select class="select_city" data-addressfield="altcontact" name="select_city">
>+                    <option value="|||"></option>
>+                    [% FOREACH c IN cities %]
>+                        [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
>+                        <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 ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactstate' %]
>+    [% UNLESS noaltcontactstate %]
>+        <li>
>+            [% IF ( mandatoryaltcontactstate ) %]
>+                <label for="altcontactstate" class="required">
>+            [% ELSE %]
>+                <label for="altcontactstate">
>+            [% END %]
>+            State:</label>
>+            <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
>+            [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactcountry' %]
>+    [% UNLESS noaltcontactcountry %]
>+        <li>
>+            [% IF ( mandatoryaltcontactcountry ) %]
>+                <label for="altcontactcountry" class="required">
>+            [% ELSE %]
>+                <label for="altcontactcountry">
>+            [% END %]
>+            Country:</label>
>+            <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
>+            [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>+
>+[% BLOCK 'alt-contact-style_altcontactphone' %]
>+    [% UNLESS noaltcontactphone %]
>+        <li>
>+            [% IF ( mandatoryaltcontactphone ) %]
>+                <label for="altcontactphone" class="required">
>+            [% ELSE %]
>+                <label for="altcontactphone">
>+            [% END %]
>+            Phone:</label>
>+            <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
>+            [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>+        </li>
>+    [% END %]
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index f42aeff396..5fd8cfc6e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -6,6 +6,7 @@
> [% USE KohaDates %]
> [% USE Branches %]
> [% PROCESS 'member-alt-address-style.inc' %]
>+[% PROCESS 'member-alt-contact-style.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>     <title>Koha &rsaquo; Patrons &rsaquo;
>@@ -746,11 +747,7 @@ legend:hover {
> 
>                             [% IF ( step_2 ) %]
>                                 [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
>-                                    [% IF Koha.Preference( 'AddressFormat' ) %]
>-                                        [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
>-                                    [% ELSE %]
>-                                        [% INCLUDE 'member-alt-contact-style-us.inc' %]
>-                                    [% END %]
>+                                    [% PROCESS 'alt-contact-style' %]
>                                 [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
>                             [% END # /IF ( step_2 ) %]
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25070: 102439 | 102440 | 102441 | 102442 | 102443 | 102477 | 102478 | 102479 | 102480 | 102481 | 102487 | 102488 | 102489 | 102490 | 102491 | 104562 | 104563 | 104564 | 104565 | 104566 | 104581 | 104582 | 104583 | 104584 | 104585 | 104659 | 104660 | 104661 | 104662 | 104663 | 105745 | 105746 | 105747 | 105748 | 105749 | 105750