<!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>[42444] trunk/src/wp-includes/media-template.php: Accessibility: Media: Improve the usage of a few label elements in the media templates.</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" 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/42444">42444</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/42444","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>2018-01-14 16:38:47 +0000 (Sun, 14 Jan 2018)</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: Media: Improve the usage of a few label elements in the media templates.
Label elements should only be used for labelable elements.
- `Uploaded By` and `Uploaded To` aren't form controls and shouldn't be associated with labels
- changes the labels for media source, alternate sources, poster image, and tracks to solve a layout issue and explicitly associate the labels to their form fields (previously, the labels were wrapping also the Remove buttons)
Props Presskopp, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/38759">#38759</a>, <a href="https://core.trac.wordpress.org/ticket/40468">#40468</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2018-01-13 18:52:42 UTC (rev 42443)
+++ trunk/src/wp-includes/media-template.php 2018-01-14 16:38:47 UTC (rev 42444)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> h = Math.ceil( ( data.model.height * w ) / data.model.width );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> h = data.model.height;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( w ) {
</span><span class="cx" style="display: block; padding: 0 10px"> w_rule = 'width: ' + w + 'px; ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'autoplay', 'loop' ) as $attr ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> #> <?php echo $attr; ?><#
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach ?>#>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,19 +434,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="name"><?php _e( 'Description' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="setting">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="name"><?php _e( 'Uploaded By' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="value">{{ data.authorName }}</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.uploadedToTitle ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="setting">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="name"><?php _e( 'Uploaded To' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.uploadedToLink ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="value">{{ data.uploadedToTitle }}</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment-compat"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,11 +1084,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types[ ext ];
</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">- <label class="setting">
- <span>SRC</span>
- <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
+ <label for="audio-source"><?php _e( 'URL' ); ?></label>
+ <input type="text" id="audio-source" readonly data-setting="src" value="{{ data.model.src }}" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,11 +1099,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types.<?php echo $type; ?>;
</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">- <label class="setting">
- <span><?php echo strtoupper( $type ); ?></span>
- <input type="text" disabled="disabled" data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
+ <label for="<?php echo $type . '-source'; ?>"><?php echo strtoupper( $type ); ?></span>
+ <input type="text" id="<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1168,11 +1168,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types[ ext ];
</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">- <label class="setting">
- <span>SRC</span>
- <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
+ <label for="video-source"><?php _e( 'URL' ); ?></label>
+ <input type="text" id="video-source" readonly data-setting="src" value="{{ data.model.src }}" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $video_types as $type ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,11 +1182,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types.<?php echo $type; ?>;
</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">- <label class="setting">
- <span><?php echo strtoupper( $type ); ?></span>
- <input type="text" disabled="disabled" data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
+ <label for="<?php echo $type . '-source'; ?>"><?php echo strtoupper( $type ); ?></label>
+ <input type="text" id="<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1203,11 +1203,11 @@
</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"> <# if ( ! _.isEmpty( data.model.poster ) ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="setting">
- <span><?php _e( 'Poster Image' ); ?></span>
- <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting">
+ <label for="poster-image"><?php _e( 'Poster Image' ); ?></label>
+ <input type="text" id="poster-image" readonly data-setting="poster" value="{{ data.model.poster }}" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link remove-setting"><?php _e( 'Remove poster image' ); ?></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="setting preload">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Preload' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1228,24 +1228,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Loop' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="setting" data-setting="content">
- <span><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="setting" data-setting="content">
</ins><span class="cx" style="display: block; padding: 0 10px"> <#
</span><span class="cx" style="display: block; padding: 0 10px"> var content = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _.isEmpty( data.model.content ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var tracks = jQuery( data.model.content ).filter( 'track' );
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( tracks.toArray(), function (track) {
</span><span class="cx" style="display: block; padding: 0 10px"> content += track.outerHTML; #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <input class="content-track" type="text" value="{{ track.outerHTML }}" />
- <button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="video-track"><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
+ <input class="content-track" type="text" id="video-track" readonly value="{{ track.outerHTML }}" />
+ <button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } ); #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <em><?php _e( 'There are no associated subtitles.' ); ?></em>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="hidden content-setting">{{ content }}</textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>