From b2c34bde8bf7bd3ed7ab7167d6f0944759fb56df Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 11 Jul 2019 10:16:35 +0000 Subject: [PATCH] Bug 23299: Switch address1 and streetnumber for German address format on opac-memberentry Test plan: Toggle value of pref AddressFormat and verify change on opac-memberentry. Signed-off-by: Marcel de Rooy Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../bootstrap/en/modules/opac-memberentry.tt | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 862091afe9..0b6e26c0be 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -7,6 +7,20 @@ [% USE KohaDates %] [% USE Math %] [% SET userupdateview = 1 %] +[% BLOCK streetnumber %] + [% UNLESS hidden.defined('streetnumber') %] +
  • + [% IF mandatory.defined('streetnumber') %] + + [% ELSE %] + + [% END %] + + + [% IF mandatory.defined('streetnumber') %]Required[% END %] +
  • + [% END %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › [% IF action == 'edit' %]Update your personal details[% ELSE %]Register a new account[% END %] @@ -370,18 +384,7 @@ Main address
      - [% UNLESS hidden.defined('streetnumber') %] -
    1. - [% IF mandatory.defined('streetnumber') %] - - [% ELSE %] - - [% END %] - - - [% IF mandatory.defined('streetnumber') %]Required[% END %] -
    2. - [% END %] + [% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %] [% UNLESS hidden.defined('address') %]
    3. @@ -396,6 +399,8 @@
    4. [% END %] + [% IF Koha.Preference('AddressFormat') == 'de' %][% INCLUDE streetnumber %][% END %] + [% UNLESS hidden.defined('address2') %]
    5. [% IF mandatory.defined('address2') %] -- 2.39.5