@@ -, +, @@
contact address as a block
---
.../member-display-altv-address-style-de.inc | 9 ++++
.../member-display-altv-address-style-fr.inc | 9 ++++
.../member-display-altv-address-style-us.inc | 11 ++++
.../prog/en/modules/members/moremember.tt | 63 +++++-----------------
4 files changed, 41 insertions(+), 51 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-fr.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-us.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-de.inc
@@ -0,0 +1,9 @@
+[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
+
[% patron.altcontactfirstname | html %] [% patron.altcontactsurname | html %][% end | html %]
+ [% if (patron.altcontactaddress1) | html %][% patron.altcontactaddress1 | html %][% end | html %]
+ [% if (patron.altcontactaddress2) | html %][% patron.altcontactaddress2 | html %][% end | html %]
+[% END %]
+[% IF ( patron.altcontactzipcode ) %] [% patron.altcontactzipcode | html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]
+[% IF ( patron.altcontactstate ) %] [% patron.altcontactstate | html %] [% END %]
+[% IF ( patron.altcontactcountry ) %] [% patron.altcontactcountry | html %][% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-fr.inc
@@ -0,0 +1,9 @@
+[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
+ [% patron.altcontactfirstname | html %] [% patron.altcontactsurname | html %][% end | html %]
+ [% if (patron.altcontactaddress1) | html %][% patron.altcontactaddress1 | html %][% end | html %]
+ [% if (patron.altcontactaddress2) | html %][% patron.altcontactaddress2 | html %][% end | html %]
+[% END %]
+[% IF ( patron.altcontactzipcode ) %] [% patron.altcontactzipcode | html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]
+[% IF ( patron.altcontactstate ) %] [% patron.altcontactstate | html %] [% END %]
+[% IF ( patron.altcontactcountry ) %] [% patron.altcontactcountry | html %][% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-us.inc
@@ -0,0 +1,11 @@
+[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
+ [% patron.altcontactfirstname | html %] [% patron.altcontactsurname | html %][% end | html %]
+ [% if (patron.altcontactaddress1) | html %][% patron.altcontactaddress1 | html %][% end | html %]
+ [% if (patron.altcontactaddress2) | html %][% patron.altcontactaddress2 | html %][% end | html %]
+[% END %]
+
+[% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 | html %], [% END %]
+[% IF ( patron.altcontactstate ) %] [% patron.altcontactstate | html %],[% END %]
+[% IF ( patron.altcontactzipcode ) %] [% patron.altcontactzipcode | html %],[% END %]
+[% IF ( patron.altcontactcountry ) %] [% patron.altcontactcountry | html %][% END %]
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -640,65 +640,26 @@
Alternative contact
Edit
+
+
+
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-altv-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-altv-address-style-us.inc' %]
+ [% END %]
+
+
- [% IF ( patron.altcontactsurname ) %]
- -
- Surname:
- [% patron.altcontactsurname | html %]
-
- [% END %]
- [% IF ( patron.altcontactfirstname ) %]
- -
- First name:
- [% patron.altcontactfirstname | html %]
-
- [% END %]
- [% IF ( patron.altcontactaddress1 ) %]
- -
- Address:
- [% patron.altcontactaddress1 | html %]
-
- [% END %]
- [% IF ( patron.altcontactaddress2 ) %]
- -
- Address 2:
- [% patron.altcontactaddress2 | html %]
-
- [% END %]
- [% IF ( patron.altcontactaddress3 ) %]
- -
- City:
- [% patron.altcontactaddress3 | html %]
-
- [% END %]
-
- [% IF ( patron.altcontactstate ) %]
- -
- State:
- [% patron.altcontactstate | html %]
-
- [% END %]
- [% IF ( patron.altcontactzipcode ) %]
- -
- ZIP/Postal code:
- [% patron.altcontactzipcode | html %]
-
- [% END %]
- [% IF ( patron.altcontactcountry ) %]
- -
- Country:
- [% patron.altcontactcountry | html %]
-
- [% END %]
[% IF ( patron.altcontactphone ) %]
-
Phone:
- [% patron.altcontactphone | html %]
+ [% patron.altcontactphone |html %]
[% END %]
-
[% # /div.rows %]
+
[% ELSE %]
Alternative contact
--