From 09ab16d61594b2e0537a12386cdd197639a83789 Mon Sep 17 00:00:00 2001
From: Ben Shum <bshum@biblio.org>
Date: Wed, 27 Jun 2012 14:01:24 -0400
Subject: [PATCH] Move Prefix field ahead of Names in patron editor

In earlier versions of Evergreen (1.6 and earlier), the Prefix field
was used to enter title information, such as Mr., Mrs., etc. When the
field was eventually added to the newer patron registration screens
(2.0+), it was added before the patron's last name field. Ideally,
the prefix should be listed prior to the patron's first name instead.

In addition, address label issues by changing "Suffix/Title" back to
only "Suffix" and making "Prefix" into "Prefix/Title".

Signed-off-by: Ben Shum <bshum@biblio.org>
---
 Open-ILS/examples/fm_IDL.xml                         | 4 ++--
 Open-ILS/src/templates/actor/user/register_table.tt2 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 88b1b71310..2c46aa2e56 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2691,11 +2691,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="Other Phone" name="other_phone"  reporter:datatype="text"/>
 			<field reporter:label="Password" name="passwd"  reporter:datatype="text"/>
 			<field reporter:label="Photo URL" name="photo_url"  reporter:datatype="text"/>
-			<field reporter:label="Prefix" name="prefix"  reporter:datatype="text"/>
+			<field reporter:label="Prefix/Title" name="prefix"  reporter:datatype="text"/>
 			<field reporter:label="Main (Profile) Permission Group" name="profile" reporter:datatype="link"/>
 			<field reporter:label="Middle Name" name="second_given_name"  reporter:datatype="text"/>
 			<field reporter:label="Standing (unused)" name="standing" reporter:datatype="link"/>
-			<field reporter:label="Suffix/Title" name="suffix"  reporter:datatype="text"/>
+			<field reporter:label="Suffix" name="suffix"  reporter:datatype="text"/>
 			<field reporter:label="Is Super User" name="super_user" reporter:datatype="bool"/>
 			<field reporter:label="Family Linkage or other Group" name="usrgroup" reporter:datatype="int"/>
 			<field reporter:label="OPAC/Staff Client User Name" name="usrname"  reporter:datatype="text"/>
diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2
index 775a19ae30..f9bdf90aa0 100644
--- a/Open-ILS/src/templates/actor/user/register_table.tt2
+++ b/Open-ILS/src/templates/actor/user/register_table.tt2
@@ -24,9 +24,9 @@
         </td>
     </tr>
     <tr fmclass='au' fmfield='passwd2' required='required'><td/><td id='verifyPassword'></td><td/></tr>
+    <tr fmclass='au' fmfield='prefix'/>
     <tr fmclass='au' fmfield='first_given_name' required='required'/>
     <tr fmclass='au' fmfield='second_given_name'/>
-    <tr fmclass='au' fmfield='prefix'/>
     <tr fmclass='au' fmfield='family_name' required='required'/>
     <tr fmclass='au' fmfield='suffix'/>
     <tr fmclass='au' fmfield='alias'/>
-- 
2.11.0