[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/members mem... [dev_week]

[Owen Leonard]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/10/11 13:45:59

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/members: memberentry.tmpl 

Log message:
	- rearranging form fields so that javascript focus will work
	- moving barcode entry to the last place in the form so that barcode scanners that send a carriage return will not submit the form prematurely

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.9.2.1&r2=1.3.2.9.2.2

Patches:
Index: memberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/memberentry.tmpl,v
retrieving revision 1.3.2.9.2.1
retrieving revision 1.3.2.9.2.2
diff -u -b -r1.3.2.9.2.1 -r1.3.2.9.2.2
--- memberentry.tmpl	11 Jul 2006 14:03:24 -0000	1.3.2.9.2.1
+++ memberentry.tmpl	11 Oct 2006 13:45:59 -0000	1.3.2.9.2.2
@@ -49,17 +49,8 @@
 			</ul>
 		</div>
 	<!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<!-- TMPL_IF NAME="addAction" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post" name="mainform">
+
 <div class="table members"><table>
 
 	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
@@ -71,7 +62,16 @@
 					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
 					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
 					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
-				</select>
+				</select>		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+		<input type="hidden" name="type" value="borrowers">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+		<!-- TMPL_IF NAME="addAction" -->
+			<input type="hidden" name="op" value="add">
+		<!-- TMPL_ELSE -->
+			<input type="hidden" name="op" value="modify">
+		<!-- /TMPL_IF -->
 				</td></tr><!-- /TMPL_UNLESS -->
 	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="initials">Initials:</label></th><td colspan="4"><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
 
@@ -149,14 +149,7 @@
 				<!-- /TMPL_LOOP -->
 </table></div>
 
-<div class="table members"><table>
-<caption>Patron Details</caption>
-	<!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
-	<tr><th><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
-	<tr><th><label for="branchcode"><a name="branch" id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
-	<tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
-</table>
-<table><caption>Additional Fields</caption>
+<div class="table members"><table><caption>Additional Fields</caption>
 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
 						<!-- TMPL_VAR Name="CGIsort1" -->
 					<!-- TMPL_ELSE -->
@@ -167,6 +160,14 @@
 					<!-- TMPL_ELSE -->
 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
 					<!--/TMPL_IF --></td></tr>
+</table></div>
+
+<div class="table members"><table>
+<caption>Patron Details</caption>
+	<!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
+	<tr><th><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
+	<tr><th><label for="branchcode"><a name="branch" id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
+	<tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
 </table>
 </div>