<!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>[44929] trunk: Accessibility: Improve the "Hello Dolly" accessibility.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44929">44929</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44929","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-18 17:18:46 +0000 (Mon, 18 Mar 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Accessibility: Improve the "Hello Dolly" accessibility.
- adds a visually hidden text to give context to the lyrics
- the text is `Quote from Hello Dolly song, by Jerry Herman:`
- adds a `lang` HTML attribute (when the admin language is not English) to better support assistive technologies
- adds a `dir` HTML attribute to better support the LTR English lyrics with RTL languages
- CSS adjustments
Props audrasjb, SergeyBiryukov, danieltj, birgire, karmatosed, desrosj, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/43632">#43632</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentpluginshellophp">trunk/src/wp-content/plugins/hello.php</a></li>
<li><a href="#trunktestsphpunittestsajaxUpdatePluginphp">trunk/tests/phpunit/tests/ajax/UpdatePlugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentpluginshellophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/plugins/hello.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/plugins/hello.php 2019-03-18 16:20:53 UTC (rev 44928)
+++ trunk/src/wp-content/plugins/hello.php 2019-03-18 17:18:46 UTC (rev 44929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @package Hello_Dolly
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 1.7.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 1.7.2
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin Name: Hello Dolly
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin URI: http://wordpress.org/plugins/hello-dolly/
</span><span class="cx" style="display: block; padding: 0 10px"> Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
</span><span class="cx" style="display: block; padding: 0 10px"> Author: Matt Mullenweg
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Version: 1.7.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Version: 1.7.2
</ins><span class="cx" style="display: block; padding: 0 10px"> Author URI: http://ma.tt/
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> While the band's playin'
</span><span class="cx" style="display: block; padding: 0 10px"> One of our old favorite songs from way back when
</span><span class="cx" style="display: block; padding: 0 10px"> So, take her wrap, fellas
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Dolly, never go away again
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Dolly, never go away again
</ins><span class="cx" style="display: block; padding: 0 10px"> Hello, Dolly
</span><span class="cx" style="display: block; padding: 0 10px"> Well, hello, Dolly
</span><span class="cx" style="display: block; padding: 0 10px"> It's so nice to have you back where you belong
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,43 +42,59 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Promise, you'll never go away
</span><span class="cx" style="display: block; padding: 0 10px"> Dolly'll never go away again";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Here we split it into lines
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Here we split it into lines.
</ins><span class="cx" style="display: block; padding: 0 10px"> $lyrics = explode( "\n", $lyrics );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // And then randomly choose a line
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // And then randomly choose a line.
</ins><span class="cx" style="display: block; padding: 0 10px"> return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// This just echoes the chosen line, we'll position it later
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// This just echoes the chosen line, we'll position it later.
</ins><span class="cx" style="display: block; padding: 0 10px"> function hello_dolly() {
</span><span class="cx" style="display: block; padding: 0 10px"> $chosen = hello_dolly_get_lyric();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<p id='dolly'>$chosen</p>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lang = '';
+ if ( 'en_' !== substr( get_user_locale(), 0, 3 ) ) {
+ $lang = ' lang="en"';
+ }
+
+ printf(
+ '<p id="dolly"><span class="screen-reader-text">%s </span><span dir="ltr"%s>%s</span></p>',
+ __( 'Quote from Hello Dolly song, by Jerry Herman:' ),
+ $lang,
+ $chosen
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Now we set that function up to execute when the admin_notices action is called
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Now we set that function up to execute when the admin_notices action is called.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_notices', 'hello_dolly' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// We need some CSS to position the paragraph
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// We need some CSS to position the paragraph.
</ins><span class="cx" style="display: block; padding: 0 10px"> function dolly_css() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This makes sure that the positioning is also good for right-to-left languages
- $x = is_rtl() ? 'left' : 'right';
-
</del><span class="cx" style="display: block; padding: 0 10px"> echo "
</span><span class="cx" style="display: block; padding: 0 10px"> <style type='text/css'>
</span><span class="cx" style="display: block; padding: 0 10px"> #dolly {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- float: $x;
- padding-$x: 15px;
- padding-top: 5px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ float: right;
+ padding: 5px 10px;
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-size: 11px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ font-size: 12px;
+ line-height: 1.6666;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .rtl #dolly {
+ float: left;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> .block-editor-page #dolly {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @media screen and (max-width: 782px) {
+ #dolly,
+ .rtl #dolly {
+ float: none;
+ padding-left: 0;
+ padding-right: 0;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_head', 'dolly_css' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
</del></span></pre></div>
<a id="trunktestsphpunittestsajaxUpdatePluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/UpdatePlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/UpdatePlugin.php 2019-03-18 16:20:53 UTC (rev 44928)
+++ trunk/tests/phpunit/tests/ajax/UpdatePlugin.php 2019-03-18 17:18:46 UTC (rev 44929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => 'hello.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pluginName' => 'Hello Dolly',
</span><span class="cx" style="display: block; padding: 0 10px"> 'errorMessage' => 'Plugin update failed.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oldVersion' => 'Version 1.7.1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oldVersion' => 'Version 1.7.2',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'newVersion' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => array( 'The plugin is at the latest version.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>