@@ -, +, @@ 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 ( patron.altcontactsurname ) %] -
    1. - Surname: - [% patron.altcontactsurname | html %] -
    2. - [% END %] - [% IF ( patron.altcontactfirstname ) %] -
    3. - First name: - [% patron.altcontactfirstname | html %] -
    4. - [% END %] - [% IF ( patron.altcontactaddress1 ) %] -
    5. - Address: - [% patron.altcontactaddress1 | html %] -
    6. - [% END %] - [% IF ( patron.altcontactaddress2 ) %] -
    7. - Address 2: - [% patron.altcontactaddress2 | html %] -
    8. - [% END %] - [% IF ( patron.altcontactaddress3 ) %] -
    9. - City: - [% patron.altcontactaddress3 | html %] -
    10. - [% END %] - - [% IF ( patron.altcontactstate ) %] -
    11. - State: - [% patron.altcontactstate | html %] -
    12. - [% END %] - [% IF ( patron.altcontactzipcode ) %] -
    13. - ZIP/Postal code: - [% patron.altcontactzipcode | html %] -
    14. - [% END %] - [% IF ( patron.altcontactcountry ) %] -
    15. - Country: - [% patron.altcontactcountry | html %] -
    16. - [% END %] [% IF ( patron.altcontactphone ) %]
    17. Phone: - [% patron.altcontactphone | html %] + [% patron.altcontactphone |html %]
    18. [% END %]
    -
    [% # /div.rows %] + [% ELSE %]

    Alternative contact

    --