From 436e55447c137420cfbe98fc962c44ea4577e65d Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 8 Dec 2011 07:19:05 +0100 Subject: [PATCH] Bug 7334: Improve 'no address stored' and similar messages in patron account MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - 'no address stored' is now only displayed when first and second line of the address are empty - added id's to all 3 possible messages so people can change or hide them To test: 1) Check 'no address stored' shows only up when address fields are both empty 2) Check address is still correctly displayed Note: make sure you check the 'checkouts' and other tabs, because there are 2 different include files used here. Signed-off-by: Frédéric Demians I confirm the bug and the solution. Text messages identification for customization with JavaScript is a plus. Signed-off-by: Paul Poulain (cherry picked from commit ac139f8f63c87123aa6ba50759eed44f0016d81b) Signed-off-by: Chris Nighswonger --- .../prog/en/includes/circ-menu.inc | 20 ++++++++++-------- .../prog/en/includes/circ-menu.tt | 21 +++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 65565629e3..6ae7cb618b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -12,19 +12,21 @@
  • [% firstname %] [% surname %] ([% cardnumber %])
  • [% END %] [% END %] -
  • [% IF ( address ) %] - [% address %] + [% IF ( address or address2 ) %] + [% IF ( address ) %] +
  • [% address %]
  • + [% END %] + [% IF ( address2 ) %] +
  • [% address2 %]
  • + [% END %] [% ELSE %] - No address stored. - [% END %] - [% IF ( address2 ) %] -
  • [% address2 %]
  • - [% END %]
  • +
  • No address stored.
  • + [% END %] [% IF ( city ) %] [% city %][% IF ( state ) %], [% state %][% END %] [% zipcode %][% IF ( country ) %], [% country %][% END %] [% ELSE %] - No city stored. + No city stored. [% END %]
  • [% IF ( phone ) %] [% phone %] @@ -35,7 +37,7 @@ [% IF ( phonepro ) %] [% phonepro %] [% ELSE %] - No phone stored. + No phone stored. [% END %] [% END %] [% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt index fe04b63cba..451cd980cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt @@ -14,19 +14,22 @@ in the global namespace %]
  • [% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])
  • [% END %] [% END %] -
  • [% IF borrower.address %] - [% borrower.address %] + [% IF ( borrower.address or borrower.address2 ) %] + [% IF ( borrower.address ) %] +
  • [% borrower.address %]
  • + [% END %] + [% IF ( borrower.address2 ) %] +
  • [% borrower.address2 %]
  • + [% END %] [% ELSE %] - No address stored. - [% END %] - [% IF borrower.address2 %] -
  • [% borrower.address2 %]
  • - [% END %]
  • +
  • No address stored.
  • + [% END %] +
  • [% IF borrower.city %] [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %] [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %] [% ELSE %] - No city stored. + No city stored. [% END %]
  • [% IF borrower.phone %] [% borrower.phone %] @@ -37,7 +40,7 @@ in the global namespace %] [% IF borrower.phonepro %] [% borrower.phonepro %] [% ELSE %] - No phone stored. + No phone stored. [% END %] [% END %] [% END %]
  • -- 2.39.5