@@ -, +, @@
---
.../includes/member-alt-contact-style-de.inc | 126 -----------
.../includes/member-alt-contact-style-fr.inc | 126 -----------
.../includes/member-alt-contact-style-us.inc | 126 -----------
.../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
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
@@ -1,126 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
@@ -1,126 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
@@ -1,126 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
@@ -0,0 +1,198 @@
+[% USE Koha %]
+[% BLOCK 'alt-contact-style' %]
+
+[% 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 %]
+
+ [% IF ( mandatoryaltcontactsurname ) %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactfirstname' %]
+ [% UNLESS noaltcontactfirstname %]
+
+ [% IF ( mandatoryaltcontactfirstname ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ First name:
+
+ [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactaddress1' %]
+ [% UNLESS noaltcontactaddress1 %]
+
+ [% IF ( mandatoryaltcontactaddress1 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
+
+ [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactaddress2' %]
+ [% UNLESS noaltcontactaddress2 %]
+
+ [% IF ( mandatoryaltcontactaddress2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
+
+ [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactzipcode' %]
+ [% UNLESS noaltcontactzipcode %]
+
+ [% IF ( mandatoryaltcontactzipcode ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ ZIP/Postal code:
+
+ [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactaddress3' %]
+ [% UNLESS noaltcontactaddress3 %]
+
+ [% IF ( mandatoryaltcontactaddress3 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
+
+ [% IF cities.count %]or choose
+
+ [% END %]
+ [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactstate' %]
+ [% UNLESS noaltcontactstate %]
+
+ [% IF ( mandatoryaltcontactstate ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
+
+ [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactcountry' %]
+ [% UNLESS noaltcontactcountry %]
+
+ [% IF ( mandatoryaltcontactcountry ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
+
+ [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-contact-style_altcontactphone' %]
+ [% UNLESS noaltcontactphone %]
+
+ [% IF ( mandatoryaltcontactphone ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Phone:
+
+ [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
+
+ [% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/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' %]
Koha › Patrons ›
@@ -735,11 +736,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 ) %]
--