From 249451642046479e73a39101208fa18953258372 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Sat, 22 Mar 2008 09:14:49 +0000
Subject: [PATCH] Improve the tabindex's on the Write>Post page.  Need to do
 the others too.

git-svn-id: https://develop.svn.wordpress.org/trunk@7472 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-form-advanced.php   | 22 +++++++++++-----------
 wp-admin/includes/template.php    |  4 ++--
 wp-includes/category-template.php |  8 ++++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 1c7e5eb25d..4eae30f645 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -84,7 +84,7 @@ else
 
 <p><strong><?php _e('Publish Status') ?></strong></p>
 <p>
-<select name='post_status'>
+<select name='post_status' tabindex='4'>
 <?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php if ( 'future' == $post->post_status ) : ?>
@@ -97,7 +97,7 @@ else
 </p>
 
 <?php if ( current_user_can( 'publish_posts' ) ) : ?>
-<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Keep this post private') ?></label></p>
+<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
 <?php endif; ?>
 <?php
 if ($post_ID) {
@@ -120,9 +120,9 @@ if ($post_ID) {
 ?>
 <?php if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish ?>
 <p class="curtime"><?php printf($stamp, $date, $time); ?>
-&nbsp;<a href="#edit_timestamp" class="edit-timestamp"><?php _e('Edit') ?></a></p>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp" tabindex='4'><?php _e('Edit') ?></a></p>
 
-<div id='timestampdiv'><?php touch_time(($action == 'edit')); ?></div>
+<div id='timestampdiv'><?php touch_time(($action == 'edit'),1,4); ?></div>
 <?php endif; ?>
 
 </div>
@@ -216,19 +216,19 @@ endif; ?>
 <div class="inside">
 
 <div id="category-adder" class="wp-hidden-children">
-	<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+	<h4><a id="category-add-toggle" href="#category-add" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
 	<p id="category-add" class="wp-hidden-child">
-		<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" />
-		<?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category') ) ); ?>
-		<input type="button" id="category-add-sumbit" class="add:categorychecklist:categorydiv button" value="<?php _e( 'Add' ); ?>" />
+		<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
+		<?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
+		<input type="button" id="category-add-sumbit" class="add:categorychecklist:categorydiv button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
 		<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
 		<span id="category-ajax-response"></span>
 	</p>
 </div>
 
 <ul id="category-tabs">
-	<li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-	<li class="wp-no-js-hidden"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+	<li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+	<li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
 </ul>
 
 <div id="categories-all" class="ui-tabs-panel">
@@ -238,7 +238,7 @@ endif; ?>
 </div>
 
 <div id="categories-pop" class="ui-tabs-panel" style="display: none;">
-	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
+	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
 		<?php wp_popular_terms_checklist('category'); ?>
 	</ul>
 </div>
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index c1ff2e6da4..707a133590 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -192,9 +192,9 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10 ) {
 		$id = "popular-category-$category->term_id";
 		?>
 
-		<li id="<?php echo $id; ?>">
+		<li id="<?php echo $id; ?>" >
 			<label class="selectit" for="in-<?php echo $id; ?>">
-				<input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" />
+			<input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" />
 				<?php echo wp_specialchars( apply_filters( 'the_category', $category->name ) ); ?>
 			</label>
 		</li>
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index b340923383..ba3f18fe70 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -216,7 +216,7 @@ function wp_dropdown_categories($args = '') {
 		'exclude' => '', 'echo' => 1,
 		'selected' => 0, 'hierarchical' => 0,
 		'name' => 'cat', 'class' => 'postform',
-		'depth' => 0
+		'depth' => 0, 'tab_index' => 0
 	);
 
 	$defaults['selected'] = ( is_category() ) ? get_query_var('cat') : 0;
@@ -225,11 +225,15 @@ function wp_dropdown_categories($args = '') {
 	$r['include_last_update_time'] = $r['show_last_update'];
 	extract( $r );
 
+	$tab_index_attribute = '';
+	if ( (int) $tab_index > 0 )
+		$tab_index_attribute = " tabindex=\"$tab_index\"";
+
 	$categories = get_categories($r);
 
 	$output = '';
 	if ( ! empty($categories) ) {
-		$output = "<select name='$name' id='$name' class='$class'>\n";
+		$output = "<select name='$name' id='$name' class='$class' $tab_index_attribute>\n";
 
 		if ( $show_option_all ) {
 			$show_option_all = apply_filters('list_cats', $show_option_all);