From 4d382bf476bc43a0a97f2c22ddb1db4fd392109c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 15 Aug 2006 23:18:53 +0000
Subject: [PATCH] * (bug 5969) Clean up tab order on Special:Userlogin forms

---
 RELEASE-NOTES                    |  1 +
 includes/templates/Userlogin.php | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f4c481edd9..52d30dd7ad 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -131,6 +131,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 1866) Improve navigation on Special:Listusers; user now a starting
   point as with Special:Allpages, rather than a pure limit.
 * Clean up tab order on Special:Blockip
+* (bug 5969) Clean up tab order on Special:Userlogin forms
 
 
 == Languages updated ==
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 6636866989..e6c886c2df 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -37,6 +37,7 @@ class UserloginTemplate extends QuickTemplate {
 			<td align='right'><label for='wpName1'><?php $this->msg('yourname') ?>:</label></td>
 			<td align='left'>
 				<input type='text' class='loginText' name="wpName" id="wpName1"
+					tabindex="1"
 					value="<?php $this->text('name') ?>" size='20' />
 			</td>
 		</tr>
@@ -44,6 +45,7 @@ class UserloginTemplate extends QuickTemplate {
 			<td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?>:</label></td>
 			<td align='left'>
 				<input type='password' class='loginPassword' name="wpPassword" id="wpPassword1"
+					tabindex="2"
 					value="<?php $this->text('password') ?>" size='20' />
 			</td>
 		</tr>
@@ -56,7 +58,8 @@ class UserloginTemplate extends QuickTemplate {
 		<tr>
 			<td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
 			<td align='left'>
-				<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>">
+				<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
+					tabindex="3">
 					<?php echo $doms ?>
 				</select>
 			</td>
@@ -66,6 +69,7 @@ class UserloginTemplate extends QuickTemplate {
 			<td></td>
 			<td align='left'>
 				<input type='checkbox' name="wpRemember"
+					tabindex="4"
 					value="1" id="wpRemember"
 					<?php if( $this->data['remember'] ) { ?>checked="checked"<?php } ?>
 					/> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
@@ -75,6 +79,7 @@ class UserloginTemplate extends QuickTemplate {
 			<td></td>
 			<td align='left' style="white-space:nowrap">
 				<input type='submit' name="wpLoginattempt" id="wpLoginattempt" value="<?php $this->msg('login') ?>" />&nbsp;<?php if( $this->data['useemail'] ) { ?><input type='submit' name="wpMailmypassword" id="wpMailmypassword"
+					tabindex="5"
 									value="<?php $this->msg('mailmypassword') ?>" />
 				<?php } ?>
 			</td>
@@ -113,6 +118,7 @@ class UsercreateTemplate extends QuickTemplate {
 			<td align='right'><label for='wpName2'><?php $this->msg('yourname') ?>:</label></td>
 			<td align='left'>
 				<input type='text' class='loginText' name="wpName" id="wpName2"
+					tabindex="1"
 					value="<?php $this->text('name') ?>" size='20' />
 			</td>
 		</tr>
@@ -120,6 +126,7 @@ class UsercreateTemplate extends QuickTemplate {
 			<td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?>:</label></td>
 			<td align='left'>
 				<input type='password' class='loginPassword' name="wpPassword" id="wpPassword2"
+					tabindex="2"
 					value="<?php $this->text('password') ?>" size='20' />
 			</td>
 		</tr>
@@ -132,7 +139,8 @@ class UsercreateTemplate extends QuickTemplate {
 		<tr>
 			<td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
 			<td align='left'>
-				<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>">
+				<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
+					tabindex="3">
 					<?php echo $doms ?>
 				</select>
 			</td>
@@ -142,6 +150,7 @@ class UsercreateTemplate extends QuickTemplate {
 			<td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?>:</label></td>
 			<td align='left'>
 				<input type='password' class='loginPassword' name="wpRetype" id="wpRetype"
+					tabindex="4"
 					value="<?php $this->text('retype') ?>"
 					size='20' />
 			</td>
@@ -151,6 +160,7 @@ class UsercreateTemplate extends QuickTemplate {
 				<td align='right'><label for='wpEmail'><?php $this->msg('youremail') ?>:</label></td>
 				<td align='left'>
 					<input type='text' class='loginText' name="wpEmail" id="wpEmail"
+						tabindex="5"
 						value="<?php $this->text('email') ?>" size='20' />
 				</td>
 			<?php } ?>
@@ -160,6 +170,7 @@ class UsercreateTemplate extends QuickTemplate {
 					<td align='right'><label for='wpRealName'><?php $this->msg('yourrealname') ?>:</label></td>
 					<td align='left'>
 						<input type='text' class='loginText' name="wpRealName" id="wpRealName"
+							tabindex="6"
 							value="<?php $this->text('realname') ?>" size='20' />
 					</td>
 			<?php } ?>
@@ -168,6 +179,7 @@ class UsercreateTemplate extends QuickTemplate {
 			<td></td>
 			<td align='left'>
 				<input type='checkbox' name="wpRemember"
+					tabindex="7"
 					value="1" id="wpRemember"
 					<?php if( $this->data['remember'] ) { ?>checked="checked"<?php } ?>
 					/> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
@@ -177,9 +189,11 @@ class UsercreateTemplate extends QuickTemplate {
 			<td></td>
 			<td align='left'>
 				<input type='submit' name="wpCreateaccount" id="wpCreateaccount"
+					tabindex="8"
 					value="<?php $this->msg('createaccount') ?>" />
 				<?php if( $this->data['createemail'] ) { ?>
 				<input type='submit' name="wpCreateaccountMail" id="wpCreateaccountMail"
+					tabindex="9"
 					value="<?php $this->msg('createaccountmail') ?>" />
 				<?php } ?>
 			</td>
-- 
2.20.1