From 0a71367dc2113de860ca25f735a4996e170e44d6 Mon Sep 17 00:00:00 2001 From: "Nicole C. Engard" Date: Tue, 9 Aug 2011 11:20:47 -0400 Subject: [PATCH] Bug 5252 - Phone labels on patron creation The labels for emails on the patron forms say 'primary' and 'secondary.' This patch does the same thing for the phones. phone is now 'Primary phone', mobile is now 'Secondary phone', and 'phonepro' is now 'Other phone'. This way the type of phone does not matter and the phone that the patron wants to be called at the most is the 'primary.' This is just a step in the direction of fixing Bug 5252, not a complete fix. This patch also updated a stray reference to Home Email. Both the OPAC and staff client are updated with this patch. Signed-off-by: Nicole C. Engard Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack --- .../prog/en/modules/members/memberentrygen.tt | 6 +++--- .../prog/en/modules/members/moremember-brief.tt | 14 +++++++------- .../prog/en/modules/members/moremember.tt | 14 +++++++------- .../opac-tmpl/prog/en/modules/opac-userdetails.tt | 4 ++-- .../opac-tmpl/prog/en/modules/opac-userupdate.tt | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 236295d59a..eea4d25b44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -480,7 +480,7 @@ [% ELSE %] + Primary Phone: [% IF ( mandatoryphone ) %]Required[% END %]
Shows on transit slips
@@ -491,7 +491,7 @@ [% ELSE %] + Secondary Phone: [% IF ( mandatoryphonepro ) %]Required[% END %] @@ -501,7 +501,7 @@ [% ELSE %] + Other Phone: [% IF ( mandatorymobile ) %]Required[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 87c7a1d463..6341705621 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -32,19 +32,19 @@ [% IF ( phonepro ) %]
  • Organization phone: [% phonepro %]
    • [% END %] [% IF ( emailpro ) %]
  • Organization email: [% emailpro %]
    • [% END %] [% ELSE %] - [% IF ( phone ) %]
  • Home: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile: [% mobile %]
    • [% END %] - [% IF ( phonepro ) %]
  • Work: [% phonepro %]
    • [% END %] + [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] + [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] + [% IF ( phonepro ) %]
  • Other phone: [% phonepro %]
    • [% END %] [% END %] [% IF ( P ) %] - [% IF ( phone ) %]
  • Professional phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Professional mobile: [% mobile %]
    • [% END %] + [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] + [% IF ( mobile ) %]
  • Secondary mobile: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] - [% IF ( email ) %]
  • Email (home):[% email %]
    • [% END %] - [% IF ( emailpro ) %]
  • Email (work): [% emailpro %]
    • [% END %] + [% IF ( email ) %]
  • Primary email:[% email %]
    • [% END %] + [% IF ( emailpro ) %]
  • Secondary email: [% emailpro %]
    • [% END %] [% END %]
  • Initials: [% initials %]
  • Date of birth:[% dateofbirth %]
    • 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 67286bf215..cfa75ca6d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -196,19 +196,19 @@ function validate1(date) { [% IF ( phonepro ) %]
  • Organization phone: [% phonepro %]
    • [% END %] [% IF ( emailpro ) %]
  • Organization email: [% emailpro %]
    • [% END %] [% ELSE %] - [% IF ( phone ) %]
  • Home: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile: [% mobile %]
    • [% END %] - [% IF ( phonepro ) %]
  • Work: [% phonepro %]
    • [% END %] + [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] + [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] + [% IF ( phonepro ) %]
  • Other phone: [% phonepro %]
    • [% END %] [% END %] [% IF ( P ) %] - [% IF ( phone ) %]
  • Professional phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Professional mobile: [% mobile %]
    • [% END %] + [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] + [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] - [% IF ( email ) %]
  • Email (home):[% email %]
    • [% END %] - [% IF ( emailpro ) %]
  • Email (work): [% emailpro %]
    • [% END %] + [% IF ( email ) %]
  • Primary email:[% email %]
    • [% END %] + [% IF ( emailpro ) %]
  • Secondary email: [% emailpro %]
    • [% END %] [% END %]
  • Initials: [% initials %]
  • Date of birth:[% dateofbirth %]
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt index cb091843a8..734ba932fb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt @@ -23,9 +23,9 @@ Card Number:[% cardnumber %] Permanent Address: [% B_address %], [% B_address2 %], [% B_city %] -Phone (Home):[% IF ( phone ) %][% phone %][% ELSE %] [% END %] +Primary Phone:[% IF ( phone ) %][% phone %][% ELSE %] [% END %] -Phone (Daytime):[% IF ( mobile ) %][% mobile %][% ELSE %] [% END %] +Secondary Phone:[% IF ( mobile ) %][% mobile %][% ELSE %] [% END %] Fax:[% IF ( fax ) %][% fax %][% ELSE %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt index 9a6885190f..db5f7f5e10 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt @@ -34,9 +34,9 @@
    • -
    • -
    • -
    • +
    • +
    • +
    • @@ -113,9 +113,9 @@
  • State: [% BORROWER_INF.state %]
  • Zip Code: [% BORROWER_INF.zipcode %]
  • Country: [% BORROWER_INF.country %]
    • -
  • Home Phone: [% BORROWER_INF.phone %]
    • -
  • Mobile Phone: [% BORROWER_INF.mobile %]
    • -
  • Work phone: [% BORROWER_INF.phonepro %]
    • +
  • Primary Phone: [% BORROWER_INF.phone %]
    • +
  • Secondary Phone: [% BORROWER_INF.mobile %]
    • +
  • Other Phone: [% BORROWER_INF.phonepro %]
  • Fax: [% BORROWER_INF.fax %]
  • Primary Email: [% BORROWER_INF.email %]
  • Secondary Email: [% BORROWER_INF.emailpro %]
    • -- 2.39.2