<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21323] trunk/wp-admin/includes: More screen reader text for list table checkboxes and theme install search.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21323">21323</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-07-25 16:18:14 +0000 (Wed, 25 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>More screen reader text for list table checkboxes and theme install search. Props MikeLittle, SergeyBiryukov. see <a href="http://core.trac.wordpress.org/ticket/21325">#21325</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplinkslisttablephp">trunk/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -317,9 +317,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function column_cb( $comment ) {
</span><del>- if ( $this->user_can ) {
- echo '<label class="screen-reader-text" for="cb-select-' . $comment->comment_ID . '">' . __( 'Select comment' )
- . "</label><input id='cb-select-$comment->comment_ID' type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
</del><ins>+ if ( $this->user_can ) { ?>
+ <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
+ <input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
+ <?php
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-links-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-links-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-links-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -128,9 +128,12 @@
</span><span class="cx"> $attributes = $class . $style;
</span><span class="cx">
</span><span class="cx"> switch ( $column_name ) {
</span><del>- 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 )
- . '</label><input type="checkbox" name="linkcheck[]" id="cb-select-' . $link->link_id . '" value="'. esc_attr( $link->link_id ) .'" /></th>';
</del><ins>+ case 'cb': ?>
+ <th scope="row" class="check-column">
+ <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
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'name':
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -666,8 +666,8 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $columns['cb'] ) ) {
</span><span class="cx"> static $cb_counter = 1;
</span><del>- $columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' )
- . '</label><input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
</del><ins>+ $columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
+ . '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
</ins><span class="cx"> $cb_counter++;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><span class="cx"> <?php if ( $user_can_edit ) { ?>
</span><del>- <label for="cb-select-<?php the_ID(); ?>" class="screen-reader-text"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label>
</del><ins>+ <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label>
</ins><span class="cx"> <input type="checkbox" name="media[]" id="cb-select-<?php the_ID(); ?>" value="<?php the_ID(); ?>" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </th>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -213,6 +213,7 @@
</span><span class="cx"> switch ( $column_name ) {
</span><span class="cx"> case 'cb': ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><ins>+ <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php printf( __( 'Select %s' ), $blogname ); ?></label>
</ins><span class="cx"> <input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
</span><span class="cx"> </th>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx"> switch ( $column_name ) {
</span><span class="cx"> case 'cb': ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><ins>+ <label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
</ins><span class="cx"> <input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
</span><span class="cx"> </th>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -371,7 +371,12 @@
</span><span class="cx">
</span><span class="cx"> $class = $is_active ? 'active' : 'inactive';
</span><span class="cx"> $checkbox_id = "checkbox_" . md5($plugin_data['Name']);
</span><del>- $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>";
</del><ins>+ 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 . "' />";
+ }
</ins><span class="cx"> if ( 'dropins' != $context ) {
</span><span class="cx"> $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
</span><span class="cx"> $plugin_name = $plugin_data['Name'];
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -492,10 +492,12 @@
</span><span class="cx">
</span><span class="cx"> case 'cb':
</span><span class="cx"> ?>
</span><del>- <th scope="row" class="check-column"><?php if ( $can_edit_post ) { ?>
- <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title );
- ?></label><input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
- <?php } ?></th>
</del><ins>+ <th scope="row" class="check-column">
+ <?php if ( $can_edit_post ) { ?>
+ <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title ); ?></label>
+ <input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
+ <?php } ?>
+ </th>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx"> $default_term = get_option( 'default_' . $taxonomy );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
</span><del>- return '<label for="cb-select-' . $tag->term_id . '" class="screen-reader-text">' . sprintf( __( 'Select %s' ), $tag->name )
- . '</label><input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
</del><ins>+ return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
+ . '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
</ins><span class="cx">
</span><span class="cx"> return '&nbsp;';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -256,8 +256,8 @@
</span><span class="cx"> $edit .= $this->row_actions( $actions );
</span><span class="cx">
</span><span class="cx"> // Set up the checkbox ( because the user is editable, otherwise its empty )
</span><del>- $checkbox = '<label for="cb-select-' . $user_object->ID . '" class="screen-reader-text">' . sprintf( __( 'Select %s' ), $user_object->user_login )
- . "</label><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
</del><ins>+ $checkbox = '<label class="screen-reader-text" for="cb-select-' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
+ . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> $edit = '<strong>' . $user_object->user_login . '</strong>';
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (21322 => 21323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2012-07-25 16:13:13 UTC (rev 21322)
+++ trunk/wp-admin/includes/theme-install.php 2012-07-25 16:18:14 UTC (rev 21323)
</span><span class="lines">@@ -58,15 +58,27 @@
</span><span class="cx"> <form id="search-themes" method="get" action="">
</span><span class="cx"> <input type="hidden" name="tab" value="search" />
</span><span class="cx"> <?php if ( $type_selector ) : ?>
</span><del>- <label class="screen-reader-text" for="typeselector"><?php _e("Type of search"); ?></label>
</del><ins>+ <label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
</ins><span class="cx"> <select name="type" id="typeselector">
</span><span class="cx"> <option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
</span><span class="cx"> <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
</span><span class="cx"> <option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
</span><span class="cx"> </select>
</span><del>- <label class="screen-reader-text" for="s"><?php printf( __("Search by %s"), ( $type == 'term' ? __( 'keyword' ) : $type ) ); ?></label>
</del><ins>+ <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>
</ins><span class="cx"> <?php else : ?>
</span><del>- <label class="screen-reader-text" for="s"><?php _e("Search by keyword"); ?></label>
</del><ins>+ <label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
</span><span class="cx"> <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>