<!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>[21457] trunk/wp-admin: Accessibility: enhance the Screen Options and Help tabs open/close, see #21326</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/21457">21457</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-08-06 04:26:37 +0000 (Mon, 06 Aug 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Accessibility: enhance the Screen Options and Help tabs open/close, see <a href="http://core.trac.wordpress.org/ticket/21326">#21326</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (21456 => 21457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php        2012-08-06 02:58:33 UTC (rev 21456)
+++ trunk/wp-admin/includes/screen.php        2012-08-06 04:26:37 UTC (rev 21457)
</span><span class="lines">@@ -744,7 +744,7 @@
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;div id=&quot;screen-meta&quot; class=&quot;metabox-prefs&quot;&gt;
</span><span class="cx"> 
</span><del>-                        &lt;div id=&quot;contextual-help-wrap&quot; class=&quot;&lt;?php echo esc_attr( $help_class ); ?&gt;&quot;&gt;
</del><ins>+                        &lt;div id=&quot;contextual-help-wrap&quot; class=&quot;&lt;?php echo esc_attr( $help_class ); ?&gt;&quot; tabindex=&quot;-1&quot; aria-label=&quot;&lt;?php esc_attr_e('Contextual Help Tab'); ?&gt;&quot;&gt;
</ins><span class="cx">                                 &lt;div id=&quot;contextual-help-back&quot;&gt;&lt;/div&gt;
</span><span class="cx">                                 &lt;div id=&quot;contextual-help-columns&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;contextual-help-tabs&quot;&gt;
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx">                                                         ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                                         &lt;li id=&quot;&lt;?php echo esc_attr( $link_id ); ?&gt;&quot;&lt;?php echo $class; ?&gt;&gt;
</span><del>-                                                                &lt;a href=&quot;&lt;?php echo esc_url( &quot;#$panel_id&quot; ); ?&gt;&quot;&gt;
</del><ins>+                                                                &lt;a href=&quot;&lt;?php echo esc_url( &quot;#$panel_id&quot; ); ?&gt;&quot; aria-controls=&quot;&lt;?php echo esc_attr( $panel_id ); ?&gt;&quot;&gt;
</ins><span class="cx">                                                                         &lt;?php echo esc_html( $tab['title'] ); ?&gt;
</span><span class="cx">                                                                 &lt;/a&gt;
</span><span class="cx">                                                         &lt;/li&gt;
</span><span class="lines">@@ -827,12 +827,12 @@
</span><span class="cx">                 &lt;div id=&quot;screen-meta-links&quot;&gt;
</span><span class="cx">                 &lt;?php if ( $this-&gt;get_help_tabs() ) : ?&gt;
</span><span class="cx">                         &lt;div id=&quot;contextual-help-link-wrap&quot; class=&quot;hide-if-no-js screen-meta-toggle&quot;&gt;
</span><del>-                        &lt;a href=&quot;#contextual-help-wrap&quot; id=&quot;contextual-help-link&quot; class=&quot;show-settings&quot;&gt;&lt;?php _e( 'Help' ); ?&gt;&lt;/a&gt;
</del><ins>+                        &lt;a href=&quot;#contextual-help-wrap&quot; id=&quot;contextual-help-link&quot; class=&quot;show-settings&quot; aria-controls=&quot;contextual-help-wrap&quot; aria-expanded=&quot;false&quot;&gt;&lt;?php _e( 'Help' ); ?&gt;&lt;/a&gt;
</ins><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;?php endif;
</span><span class="cx">                 if ( $this-&gt;show_screen_options() ) : ?&gt;
</span><span class="cx">                         &lt;div id=&quot;screen-options-link-wrap&quot; class=&quot;hide-if-no-js screen-meta-toggle&quot;&gt;
</span><del>-                        &lt;a href=&quot;#screen-options-wrap&quot; id=&quot;show-settings-link&quot; class=&quot;show-settings&quot;&gt;&lt;?php _e( 'Screen Options' ); ?&gt;&lt;/a&gt;
</del><ins>+                        &lt;a href=&quot;#screen-options-wrap&quot; id=&quot;show-settings-link&quot; class=&quot;show-settings&quot; aria-controls=&quot;screen-options-wrap&quot; aria-expanded=&quot;false&quot;&gt;&lt;?php _e( 'Screen Options' ); ?&gt;&lt;/a&gt;
</ins><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx">                 $hidden  = get_hidden_columns( $this );
</span><span class="cx"> 
</span><span class="cx">                 ?&gt;
</span><del>-                &lt;div id=&quot;screen-options-wrap&quot; class=&quot;hidden&quot;&gt;
</del><ins>+                &lt;div id=&quot;screen-options-wrap&quot; class=&quot;hidden&quot; tabindex=&quot;-1&quot; aria-label=&quot;&lt;?php esc_attr_e('Screen Options Tab'); ?&gt;&quot;&gt;
</ins><span class="cx">                 &lt;form id=&quot;adv-settings&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
</span><span class="cx">                 &lt;?php if ( isset( $wp_meta_boxes[ $this-&gt;id ] ) || $this-&gt;get_option( 'per_page' ) || ( $columns &amp;&amp; empty( $columns['_title'] ) ) ) : ?&gt;
</span><span class="cx">                         &lt;h5&gt;&lt;?php _e( 'Show on screen' ); ?&gt;&lt;/h5&gt;
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (21456 => 21457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js        2012-08-06 02:58:33 UTC (rev 21456)
+++ trunk/wp-admin/js/common.dev.js        2012-08-06 04:26:37 UTC (rev 21457)
</span><span class="lines">@@ -121,13 +121,14 @@
</span><span class="cx"> 
</span><span class="cx">                 panel.parent().show();
</span><span class="cx">                 panel.slideDown( 'fast', function() {
</span><del>-                        link.addClass('screen-meta-active');
</del><ins>+                        panel.focus();
+                        link.addClass('screen-meta-active').attr('aria-expanded', true);
</ins><span class="cx">                 });
</span><span class="cx">         },
</span><span class="cx"> 
</span><span class="cx">         close: function( panel, link ) {
</span><span class="cx">                 panel.slideUp( 'fast', function() {
</span><del>-                        link.removeClass('screen-meta-active');
</del><ins>+                        link.removeClass('screen-meta-active').attr('aria-expanded', false);
</ins><span class="cx">                         $('.screen-meta-toggle').css('visibility', '');
</span><span class="cx">                         panel.parent().hide();
</span><span class="cx">                 });
</span></span></pre>
</div>
</div>

</body>
</html>