From d95e54dc3f84e6fcbcce9215e2ae45fd351583a4 Mon Sep 17 00:00:00 2001
From: Jesse Maseto <jesse@bywatersolutions.com>
Date: Wed, 12 Mar 2014 10:41:54 -0400
Subject: [PATCH] Adjusted fields to display correctly. Now the fields on the memberentry page match the memberdetails page.

To test:
Select a patron account that you can edit their phone number information

Fill in all 3 phone number fields:

	 Primary phone:  #1
         Secondary phone: #2
         Other phone: #3

Then view the member details page. This will display #1,#3,#2.

Apply patch and should display correctly.

http://bugs.koha-community.org/show_bug.cgi?id=8760
---
 .../prog/en/modules/members/memberentrygen.tt      |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 720193f..714e5f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -585,27 +585,27 @@
 
     </li>
         [% END %]
-        [% UNLESS nophonepro %]
+        [% UNLESS nomobile %]
     <li>
-      [% IF ( mandatoryphonepro ) %]
-      <label for="phonepro" class="required">
+      [% IF ( mandatorymobile ) %]
+      <label for="mobile" class="required">
       [% ELSE %]
-      <label for="phonepro">
+      <label for="mobile">
       [% END %]
       Secondary phone: </label>
-    <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" class="[% focusAction %]" />
-	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
+    <input type="text" id="mobile" name="mobile" value="[% mobile %]" class="[% focusAction %]" />
+	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nomobile %]
     <li>
-      [% IF ( mandatorymobile ) %]
-      <label for="mobile" class="required">
+      [% IF ( mandatoryphonepro ) %]
+      <label for="phonepro" class="required">
       [% ELSE %]
-      <label for="mobile">
+      <label for="phonepro">
       [% END %]
       Other phone: </label>
-        <input type="text" id="mobile" name="mobile" value="[% mobile %]" class="[% focusAction %]" />
+        <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" class="[% focusAction %]" />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-- 
1.7.2.5