From 4ed61b56f50b7dd4d3cc29a5ada93c25212a7e39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Tue, 28 Mar 2017 09:20:47 +0200 Subject: [PATCH] Bug 18110: Folllowup to fix alternative address and add missing class This patch fixes the display of alternative address (streetnumber, streettype and address on same line, see comment #22, and it adds missing class patronaddress1 to main address display. To test: - Create / edit a customer to have streetnumber, streettype and address in both main address and alternate address - Switch syspref addressformat ot French style - Verify that both main address and alternate address display as expected on patron's detail page (street number, street type and address on same line) Signed-off-by: Baptiste Wojtkowski Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../en/includes/member-display-address-style-fr.inc | 3 +-- .../includes/member-display-alt-address-style-fr.inc | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc index 531a89d5e8..14cc17be92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc @@ -1,11 +1,10 @@ [% IF ( address or address2 ) %] [% IF ( address ) %] -
  • [% SET roadtype_desc = '' %] [% IF streettype %] [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %] [% END %] - [% IF streetnumber %][% streetnumber %] [% END %] +
  • [% IF streetnumber %][% streetnumber %] [% END %] [%IF roadtype_desc %][% roadtype_desc %] [% END %] [% address %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc index fa98ba41fb..f2625bd5ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc @@ -1,20 +1,20 @@ [% IF ( B_address or B_address2 ) %] [% IF ( B_address ) %] [% SET roadtype_desc = '' %] - [% IF B_streetnumber %] [% B_streetnumber %][% END %] [% IF B_streettype %] [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %] [% END %] -
  • [% B_address %] - [%IF roadtype_desc %] [% roadtype_desc %][% END %] +
  • [% IF B_streetnumber %][% B_streetnumber %][% END %] + [%IF roadtype_desc %][% roadtype_desc %] [% END %] + [% B_address %]
  • [% END %] [% IF ( B_address2 ) %]
  • [% B_address2 %]
  • [% END %] [% END %] -[% IF ( B_city ) %]
  • - [%IF ( B_zipcode ) %][% B_zipcode %] [% END %] +[% IF ( B_city ) %] +
  • [%IF ( B_zipcode ) %][% B_zipcode %] [% END %] [% B_city %] [% IF ( B_state ) %]
    [% B_state %][% END %] [% IF ( B_country ) %]
    [% B_country %][% END %]
  • -- 2.39.5