More screen reader text for list table checkboxes and theme install search. Props MikeLittle, SergeyBiryukov. see #21325

git-svn-id: http://core.svn.wordpress.org/trunk@21323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-07-25 16:18:14 +00:00
parent f45383244d
commit 73addbbd24
11 changed files with 46 additions and 21 deletions

View File

@ -317,9 +317,10 @@ class WP_Comments_List_Table extends WP_List_Table {
} }
function column_cb( $comment ) { function column_cb( $comment ) {
if ( $this->user_can ) { if ( $this->user_can ) { ?>
echo '<label class="screen-reader-text" for="cb-select-' . $comment->comment_ID . '">' . __( 'Select comment' ) <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
. "</label><input id='cb-select-$comment->comment_ID' type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />"; <input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
<?php
} }
} }

View File

@ -128,9 +128,12 @@ class WP_Links_List_Table extends WP_List_Table {
$attributes = $class . $style; $attributes = $class . $style;
switch ( $column_name ) { switch ( $column_name ) {
case 'cb': case 'cb': ?>
echo '<th scope="row" class="check-column"><label for="cb-select-' . $link->link_id . '" class="screen-reader-text">' . sprintf( __( 'Select %s' ), $link->link_name ) <th scope="row" class="check-column">
. '</label><input type="checkbox" name="linkcheck[]" id="cb-select-' . $link->link_id . '" value="'. esc_attr( $link->link_id ) .'" /></th>'; <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
</th>
<?php
break; break;
case 'name': case 'name':

View File

@ -666,8 +666,8 @@ class WP_List_Table {
if ( ! empty( $columns['cb'] ) ) { if ( ! empty( $columns['cb'] ) ) {
static $cb_counter = 1; static $cb_counter = 1;
$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) $columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
. '</label><input id="cb-select-all-' . $cb_counter . '" type="checkbox" />'; . '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
$cb_counter++; $cb_counter++;
} }

View File

@ -191,7 +191,7 @@ foreach ( $columns as $column_name => $column_display_name ) {
?> ?>
<th scope="row" class="check-column"> <th scope="row" class="check-column">
<?php if ( $user_can_edit ) { ?> <?php if ( $user_can_edit ) { ?>
<label for="cb-select-<?php the_ID(); ?>" class="screen-reader-text"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label> <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label>
<input type="checkbox" name="media[]" id="cb-select-<?php the_ID(); ?>" value="<?php the_ID(); ?>" /> <input type="checkbox" name="media[]" id="cb-select-<?php the_ID(); ?>" value="<?php the_ID(); ?>" />
<?php } ?> <?php } ?>
</th> </th>

View File

@ -213,6 +213,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
switch ( $column_name ) { switch ( $column_name ) {
case 'cb': ?> case 'cb': ?>
<th scope="row" class="check-column"> <th scope="row" class="check-column">
<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php printf( __( 'Select %s' ), $blogname ); ?></label>
<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" /> <input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
</th> </th>
<?php <?php

View File

@ -165,6 +165,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
switch ( $column_name ) { switch ( $column_name ) {
case 'cb': ?> case 'cb': ?>
<th scope="row" class="check-column"> <th scope="row" class="check-column">
<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" /> <input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
</th> </th>
<?php <?php

View File

@ -371,7 +371,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
$class = $is_active ? 'active' : 'inactive'; $class = $is_active ? 'active' : 'inactive';
$checkbox_id = "checkbox_" . md5($plugin_data['Name']); $checkbox_id = "checkbox_" . md5($plugin_data['Name']);
$checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>"; if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
$checkbox = '';
} else {
$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
}
if ( 'dropins' != $context ) { if ( 'dropins' != $context ) {
$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>'; $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
$plugin_name = $plugin_data['Name']; $plugin_name = $plugin_data['Name'];

View File

@ -492,10 +492,12 @@ class WP_Posts_List_Table extends WP_List_Table {
case 'cb': case 'cb':
?> ?>
<th scope="row" class="check-column"><?php if ( $can_edit_post ) { ?> <th scope="row" class="check-column">
<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title ); <?php if ( $can_edit_post ) { ?>
?></label><input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" /> <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title ); ?></label>
<?php } ?></th> <input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
<?php } ?>
</th>
<?php <?php
break; break;

View File

@ -236,8 +236,8 @@ class WP_Terms_List_Table extends WP_List_Table {
$default_term = get_option( 'default_' . $taxonomy ); $default_term = get_option( 'default_' . $taxonomy );
if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
return '<label for="cb-select-' . $tag->term_id . '" class="screen-reader-text">' . sprintf( __( 'Select %s' ), $tag->name ) return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
. '</label><input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />'; . '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
return '&nbsp;'; return '&nbsp;';
} }

View File

@ -256,8 +256,8 @@ class WP_Users_List_Table extends WP_List_Table {
$edit .= $this->row_actions( $actions ); $edit .= $this->row_actions( $actions );
// Set up the checkbox ( because the user is editable, otherwise its empty ) // Set up the checkbox ( because the user is editable, otherwise its empty )
$checkbox = '<label for="cb-select-' . $user_object->ID . '" class="screen-reader-text">' . sprintf( __( 'Select %s' ), $user_object->user_login ) $checkbox = '<label class="screen-reader-text" for="cb-select-' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
. "</label><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />"; . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
} else { } else {
$edit = '<strong>' . $user_object->user_login . '</strong>'; $edit = '<strong>' . $user_object->user_login . '</strong>';

View File

@ -58,15 +58,27 @@ function install_theme_search_form( $type_selector = true ) {
<form id="search-themes" method="get" action=""> <form id="search-themes" method="get" action="">
<input type="hidden" name="tab" value="search" /> <input type="hidden" name="tab" value="search" />
<?php if ( $type_selector ) : ?> <?php if ( $type_selector ) : ?>
<label class="screen-reader-text" for="typeselector"><?php _e("Type of search"); ?></label> <label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
<select name="type" id="typeselector"> <select name="type" id="typeselector">
<option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option> <option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option> <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option> <option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
</select> </select>
<label class="screen-reader-text" for="s"><?php printf( __("Search by %s"), ( $type == 'term' ? __( 'keyword' ) : $type ) ); ?></label> <label class="screen-reader-text" for="s"><?php
switch ( $type ) {
case 'term':
_e( 'Search by keyword' );
break;
case 'author':
_e( 'Search by author' );
break;
case 'tag':
_e( 'Search by tag' );
break;
}
?></label>
<?php else : ?> <?php else : ?>
<label class="screen-reader-text" for="s"><?php _e("Search by keyword"); ?></label> <label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
<?php endif; ?> <?php endif; ?>
<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" /> <input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
<?php submit_button( __( 'Search' ), 'button', 'search', false ); ?> <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>