From 2c6a6e92c2aab64f0bdd94d5e647aac2c67fb80a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 12 Nov 2014 14:42:37 -0500 Subject: [PATCH] Bug 13142 - Change "mobile phone" label back to "other phone" Content-Type: text/plain; charset="utf-8" Labeling a phone number field "mobile phone" eliminates the usefulness of having the labels "primary" and "secondary." Generic labels let the user populate the fields according to their importance rather than their type. To test I recommend editing a patron record so that the values in the patron record contain a label matching the table column: borrowers.phone : 555-555-1234 (primary - phone) borrowers.phonepro : 555-555-5678 (secondary - phonepro) borrowers.mobile : 555-555-9012 (other - mobile) View this patron's information in the various affected templates and verify that the labels correctly match the data: - OPAC "your personal details" (opac-memberentry.pl) - Submit changes to primary, secondary, and other phone via the OPAC. In the staff client, view the confirmation for those changes. - Patron details in the staff client (moremember.pl) - Patron entry/edit in the staff client (memberentrygen.pl) - Patron duplicate confirmation in the staff client (you can navigate directly to /members/moremember.pl?borrowernumber=XXXX&print=brief) --- koha-tmpl/intranet-tmpl/prog/en/columns.def | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/members-update.tt | 4 ++-- .../prog/en/modules/members/moremember-brief.tt | 4 ++-- .../prog/en/modules/members/moremember.tt | 4 ++-- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def index ec0fb56..636811d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/columns.def +++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def @@ -18,7 +18,7 @@ Country Primary phone Secondary phone -Mobile phone +Other phone Primary email Secondary email Fax 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 56cc570..6460e86 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -603,7 +603,7 @@ [% ELSE %] + Other phone: [% IF ( mandatorymobile ) %]Required[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt index 9231ef7..5d966df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -28,8 +28,8 @@ [% CASE 'zipcode' %]Zip code [% CASE 'country' %]Country [% CASE 'email' %]Email -[% CASE 'phone' %]Primary Phone -[% CASE 'mobile' %]Primary Mobile Phone +[% CASE 'phone' %]Primary phone +[% CASE 'mobile' %]Other phone [% CASE 'fax' %]Fax [% CASE 'emailpro' %]Secondary email [% CASE 'phonepro' %]Secondary phone 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 57e4d49..b46424e 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 @@ -34,12 +34,12 @@ [% ELSE %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] [% IF ( phonepro ) %]
  • Secondary phone: [% phonepro %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile phone: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile phone: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] 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 87de21e..4e1358a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -201,12 +201,12 @@ function validate1(date) { [% ELSE %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] [% IF ( phonepro ) %]
  • Secondary phone: [% phonepro %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile phone: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Mobile phone: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] 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 90215fb..76fa520 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -396,7 +396,7 @@ [% ELSE %] + Other phone: [% IF mandatory.defined('mobile') %]Required[% END %] -- 1.7.9.5