@@ -, +, @@
---
.../includes/member-main-address-style-de.inc | 125 ------------
.../includes/member-main-address-style-fr.inc | 126 ------------
.../includes/member-main-address-style-us.inc | 125 ------------
.../en/includes/member-main-address-style.inc | 190 ++++++++++++++++++
.../prog/en/modules/members/memberentrygen.tt | 7 +-
5 files changed, 192 insertions(+), 381 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
@@ -1,125 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
@@ -1,126 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
@@ -1,125 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
@@ -0,0 +1,190 @@
+[% USE Koha %]
+[% BLOCK 'main-address-style' %]
+
+[% 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 %]
+
+ [% IF ( mandatorystreetype ) %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_address' %]
+ [% UNLESS noaddress %]
+
+ [% IF ( mandatoryaddress ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
+
+ [% IF ( mandatoryaddress ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_streetnumber' %]
+ [% UNLESS nostreetnumber %]
+
+ [% IF ( mandatorystreetnumber ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Street Number:
+
+ [% IF ( mandatorystreetnumber ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_address2' %]
+ [% UNLESS noaddress2 %]
+
+ [% IF ( mandatoryaddress2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
+
+ [% IF ( mandatoryaddress2 ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_zipcode' %]
+ [% UNLESS nozipcode %]
+
+ [% IF ( mandatoryzipcode ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ ZIP/Postal code:
+
+ [% IF ( mandatoryzipcode ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_city' %]
+ [% UNLESS nocity %]
+
+ [% IF ( mandatorycity ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
+
+ [% IF cities.count %]
+ or choose
+
+ [% END %]
+ [% IF ( mandatorycity ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_state' %]
+ [% UNLESS nostate %]
+
+ [% IF ( mandatorystate ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
+
+ [% IF ( mandatorystate ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'address-style_country' %]
+ [% UNLESS nocountry %]
+
+ [% IF ( mandatorycountry ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
+
+ [% IF ( mandatorycountry ) %]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
@@ -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 %]
@@ -561,11 +562,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 %]
--