From 2370c6f0faddaef05d9c1d9f61dee2b04407e9dd Mon Sep 17 00:00:00 2001 From: Brendon Ford <brendon.ford@manhattan.edu> Date: Thu, 12 Jun 2014 20:28:28 -0400 Subject: [PATCH] Bug 12407 - phone label or data switched Phone numbers are now associated with the correct phone number. --- .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 c9fb845..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 @@ -33,13 +33,13 @@ [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %] [% ELSE %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %] - [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %] - [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %] + [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %] + [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %] - [% IF ( mobile ) %]<li><span class="label">Secondary mobile: </span>[% mobile %]</li>[% END %] + [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %] [% END %] [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% 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 345c728..d42ae59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -225,13 +225,13 @@ function validate1(date) { [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %] [% ELSE %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %] - [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %] - [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %] + [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %] + [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %] - [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %] + [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %] [% END %] [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %] [% UNLESS ( I ) %] -- 1.7.10.4