From 7a14823fa34225f672854a0bb3c8fd39116e5d0e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 6 Dec 2011 18:45:33 +0100 Subject: [PATCH] Bug 7324: Show alternate email as mailto: / hide labels when field is empty UPDATE 2011-12-15 Fixed wrong div that broke the patron account display. Thank you Paul for catching this! Changes made to the patron detail tab: - alternate email shows as mailto: link - labels for following fields only show when field is filled - initials - date of birth - gender - country (alternate address) - email (alternate address) - state (alternative contact) - country (alternative contact) - phone (alternative contact) To test: 1) Add new patron with minimal data and check the labels don't show 2) Change patron to have data in changed fields and check labels show 3) Check all email addresses are shown as mailto: links now Signed-off-by: Liz Rea Verified tests 1-3, looks good to me. Signed-off-by: Paul Poulain (cherry picked from commit 52dca0f4337b83bff4ff2de457f21b8b7ab70134) Signed-off-by: Chris Nighswonger --- .../prog/en/modules/members/moremember.tt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index cce4cd9639..f17c79d21c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -216,11 +216,11 @@ function validate1(date) { [% IF ( email ) %]
  • Primary email:[% email %]
    • [% END %] [% IF ( emailpro ) %]
  • Secondary email: [% emailpro %]
    • [% END %] [% END %] -
  • Initials: [% initials %]
    • -
  • Date of birth:[% dateofbirth %]
    • -
  • Gender: + [% IF ( initials ) %]
  • Initials: [% initials %]
    • [% END %] + [% IF ( dateofbirth ) %]
  • Date of birth:[% dateofbirth %]
    • [% END %] + [% IF ( sex ) %]
  • Gender: [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %] -
    • [% END %] + [% END %][% END %] [% IF ( printethnicityline ) %]
  • Ethnicity:[% ethnicity %]
  • Ethnicity notes: [% ethnotes %]
    • @@ -370,9 +370,9 @@ function validate1(date) {
  • City: [% B_city %]
    • [% IF ( B_state ) %]
  • State: [% B_state %]
    • [% END %]
  • Zip/Postal Code: [% B_zipcode %]
    • -
  • Country: [% B_country %]
    • + [% IF ( B_country ) %]
  • Country: [% B_country %]
    • [% END %] [% IF ( B_phone ) %]
  • Phone: [% B_phone %]
    • [% END %] - [% IF ( B_email ) %]
  • Email: [% B_email %]
    • [% END %] + [% IF ( B_email ) %]
  • Email: [% email %]
    • [% END %]
    Edit
    [% END %] @@ -384,10 +384,11 @@ function validate1(date) {
  • Address: [% altcontactaddress1 %]
  • Address 2: [% altcontactaddress2 %]
  • City: [% altcontactaddress3 %]
    • - [% IF ( altcontactstate ) %]
  • State: [% altcontactstate %]
    • [% END %] + [% IF ( altcontactstate ) %]
  • State: [% altcontactstate %]
    • [% END %]
  • Zip/Postal Code: [% altcontactzipcode %]
    • -
  • Country: [% altcontactcountry %]
    • -
  • Phone: [% altcontactphone %]
    • + [% IF ( altcontactcountry ) %]
  • Country: [% altcontactcountry %]
    • [% END %] + [% IF ( altcontactphone ) %]
  • Phone: [% altcontactphone %]
    • [% END %] +
    Edit
    -- 2.39.5