<!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>[27013] branches/3.8: Themes screen: Add aria-describedby attributes to provide better information to screen readers.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/27013">27013</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-22 21:00:05 +0000 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes screen: Add aria-describedby attributes to provide better information to screen readers.
Merges <a href="http://core.trac.wordpress.org/changeset/27012">[27012]</a> to the 3.8 branch.
props joedolson for initial patch.
fixes <a href="http://core.trac.wordpress.org/ticket/26602">#26602</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches38srcwpadminjsdashboardjs">branches/3.8/src/wp-admin/js/dashboard.js</a></li>
<li><a href="#branches38srcwpadminjsthemejs">branches/3.8/src/wp-admin/js/theme.js</a></li>
<li><a href="#branches38srcwpadminthemesphp">branches/3.8/src/wp-admin/themes.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches38">branches/3.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.8
</span><span class="cx">===================================================================
</span><del>--- branches/3.8 2014-01-22 20:59:29 UTC (rev 27012)
</del><ins>+++ branches/3.8 2014-01-22 21:00:05 UTC (rev 27013)
</ins><a id="branches38"></a>
<div class="propset"><h4>Property changes: branches/3.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007
</del><ins>+/trunk:18512,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007,27012
</ins><span class="cx">\ No newline at end of property
</span><a id="branches38srcwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/js/dashboard.js (27012 => 27013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/js/dashboard.js 2014-01-22 20:59:29 UTC (rev 27012)
+++ branches/3.8/src/wp-admin/js/dashboard.js 2014-01-22 21:00:05 UTC (rev 27013)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> // is to ensure that the height of a final trailing newline is included.
</span><span class="cx"> textareaContent = $this.val().replace(/\n/g, '<br>') + ' ',
</span><span class="cx"> // 2px is for border-top & border-bottom
</span><del>- cloneHeight = clone.css('width', $this.css('width')).html(textareaContent).outerHeight() + 2;
</del><ins>+ cloneHeight = clone.css('width', $this.css('width')).text(textareaContent).outerHeight() + 2;
</ins><span class="cx">
</span><span class="cx"> // Default to having scrollbars
</span><span class="cx"> editor.css('overflow-y', 'auto');
</span></span></pre></div>
<a id="branches38srcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/js/theme.js (27012 => 27013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/js/theme.js 2014-01-22 20:59:29 UTC (rev 27012)
+++ branches/3.8/src/wp-admin/js/theme.js 2014-01-22 21:00:05 UTC (rev 27013)
</span><span class="lines">@@ -198,7 +198,10 @@
</span><span class="cx"> render: function() {
</span><span class="cx"> var data = this.model.toJSON();
</span><span class="cx"> // Render themes using the html template
</span><del>- this.$el.html( this.html( data ) ).attr( 'tabindex', 0 );
</del><ins>+ this.$el.html( this.html( data ) ).attr({
+ tabindex: 0,
+ 'aria-describedby' : data.id + '-action ' + data.id + '-name'
+ });
</ins><span class="cx">
</span><span class="cx"> // Renders active theme styles
</span><span class="cx"> this.activeTheme();
</span></span></pre></div>
<a id="branches38srcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/themes.php (27012 => 27013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/themes.php 2014-01-22 20:59:29 UTC (rev 27012)
+++ branches/3.8/src/wp-admin/themes.php 2014-01-22 21:00:05 UTC (rev 27013)
</span><span class="lines">@@ -191,8 +191,11 @@
</span><span class="cx"> * This PHP is synchronized with the tmpl-theme template below!
</span><span class="cx"> */
</span><span class="cx">
</span><del>-foreach ( $themes as $theme ) : ?>
-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0">
</del><ins>+foreach ( $themes as $theme ) :
+ $aria_action = esc_attr( $theme['id'] . '-action' );
+ $aria_name = esc_attr( $theme['id'] . '-name' );
+ ?>
+<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
</ins><span class="cx"> <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
</span><span class="cx"> <div class="theme-screenshot">
</span><span class="cx"> <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />
</span><span class="lines">@@ -200,13 +203,13 @@
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <div class="theme-screenshot blank"></div>
</span><span class="cx"> <?php } ?>
</span><del>- <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
</del><ins>+ <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
</ins><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
</span><span class="cx">
</span><span class="cx"> <?php if ( $theme['active'] ) { ?>
</span><del>- <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> <?php echo $theme['name']; ?></h3>
</del><ins>+ <h3 class="theme-name" id="<?php echo $aria_name; ?>"><span><?php _ex( 'Active:', 'theme' ); ?></span> <?php echo $theme['name']; ?></h3>
</ins><span class="cx"> <?php } else { ?>
</span><del>- <h3 class="theme-name"><?php echo $theme['name']; ?></h3>
</del><ins>+ <h3 class="theme-name" id="<?php echo $aria_name; ?>"><?php echo $theme['name']; ?></h3>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="theme-actions">
</span><span class="lines">@@ -277,13 +280,13 @@
</span><span class="cx"> <# } else { #>
</span><span class="cx"> <div class="theme-screenshot blank"></div>
</span><span class="cx"> <# } #>
</span><del>- <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
</del><ins>+ <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
</ins><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
</span><span class="cx">
</span><span class="cx"> <# if ( data.active ) { #>
</span><del>- <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
</del><ins>+ <h3 class="theme-name" id="{{ data.id }}-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
</ins><span class="cx"> <# } else { #>
</span><del>- <h3 class="theme-name">{{{ data.name }}}</h3>
</del><ins>+ <h3 class="theme-name" id="{{ data.id }}-name">{{{ data.name }}}</h3>
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <div class="theme-actions">
</span></span></pre>
</div>
</div>
</body>
</html>