From e6752ed58166407bf8e2e353e4acde5815df2a02 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 25 Sep 2020 17:08:38 +0200 Subject: [PATCH] Bug 26538: Display cities list before input text In patron creation or edition actually the city field is displayed with input text then cities list. I propose to display cities list first since it is more likely used. Test plan : 1) Create some cities 2) Open patron creation form 3) Check you see for each city field : cities list, text "or enter", text input 4) Delete all cities 5) Open patron creation form 6) Check you see for each city field : only text input Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 5a669249148d3f874ebc9977be9d4be6a6d92f8d) Signed-off-by: Lucas Gass --- .../prog/en/includes/member-alt-address-style.inc | 4 ++-- .../prog/en/includes/member-alt-contact-style.inc | 5 +++-- .../prog/en/includes/member-main-address-style.inc | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc index 28a9ce3503..f31f379d84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc @@ -147,9 +147,7 @@ - [% IF cities.count %] - or choose + or enter [% END %] + [% IF ( mandatoryB_city ) %]Required[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc index 875699a969..2ff1a84f65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc @@ -132,8 +132,7 @@ - - [% IF cities.count %]or choose + [% IF cities.count %] + or enter [% END %] + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc index 1c40b1b73a..8ed3792d91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc @@ -138,9 +138,7 @@ - [% IF cities.count %] - or choose + or enter [% END %] + [% IF ( mandatorycity ) %]Required[% END %] [% END %] -- 2.39.5