<!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>[35316] trunk/src/wp-admin: Export: add missing labels and improvement accessibility of the Export screen.</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/35316">35316</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/35316","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-21 03:56:22 +0000 (Wed, 21 Oct 2015)</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'>Export: add missing labels and improvement accessibility of the Export screen.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/33046">#33046</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssformscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/forms.css 2015-10-21 03:50:19 UTC (rev 35315)
+++ trunk/src/wp-admin/css/forms.css 2015-10-21 03:56:22 UTC (rev 35316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,6 +753,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.label-responsive {
+ vertical-align: middle;
+}
+
+#export-filters p {
+ margin: 0 0 1em;
+}
+
+#export-filters p.submit {
+ margin: 7px 0 5px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Card styles */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .card {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1110,12 +1122,21 @@
</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"> .form-table th,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .form-table td {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .form-table td,
+ .label-responsive {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> width: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: middle;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .label-responsive {
+ margin: 0.5em 0;
+ }
+
+ .export-filters li {
+ margin-bottom: 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .form-table .color-palette td {
</span><span class="cx" style="display: block; padding: 0 10px"> display: table-cell;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 15px;
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2015-10-21 03:50:19 UTC (rev 35315)
+++ trunk/src/wp-admin/export.php 2015-10-21 03:56:22 UTC (rev 35316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,12 +92,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['status'] = $_GET['page_status'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'attachment' == $_GET['content'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'attachment';
</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"> if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['start_date'] = $_GET['attachment_start_date'];
</span><span class="cx" style="display: block; padding: 0 10px"> $args['end_date'] = $_GET['attachment_end_date'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> else {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = $_GET['content'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,37 +160,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Choose what to export' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="get" id="export-filters">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<fieldset>
+<legend class="screen-reader-text"><?php _e( 'Content to export' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="download" value="true" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label><input type="radio" name="content" value="all" checked="checked" /> <?php _e( 'All content' ); ?></label></p>
-<p class="description"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e( 'All content' ); ?></label></p>
+<p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="post-filters" class="export-filters">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Categories:' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><span class="label-responsive"><?php _e( 'Categories:' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_dropdown_categories( array( 'show_option_all' => __('All') ) ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Authors:' ); ?></label>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_users( array( 'include' => $authors, 'name' => 'post_author', 'multi' => true, 'show_option_all' => __('All') ) );
</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">+ ?>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Date range:' ); ?></label>
- <select name="post_start_date">
- <option value="0"><?php _e( 'Start Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
+ <legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+ <label for="post-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+ <select name="post_start_date" id="post-start-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select name="post_end_date">
- <option value="0"><?php _e( 'End Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="post-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+ <select name="post_end_date" id="post-end-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Status:' ); ?></label>
- <select name="post_status">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="post-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+ <select name="post_status" id="post-status">
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php _e( 'All' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_stati as $status ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,26 +211,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="radio" name="content" value="pages" /> <?php _e( 'Pages' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="page-filters" class="export-filters">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Authors:' ); ?></label>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_users( array( 'include' => $authors, 'name' => 'page_author', 'multi' => true, 'show_option_all' => __('All') ) );
</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">+ ?>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Date range:' ); ?></label>
- <select name="page_start_date">
- <option value="0"><?php _e( 'Start Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
+ <legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+ <label for="page-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+ <select name="page_start_date" id="page-start-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options( 'page' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select name="page_end_date">
- <option value="0"><?php _e( 'End Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="page-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+ <select name="page_end_date" id="page-end-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options( 'page' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Status:' ); ?></label>
- <select name="page_status">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="page-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+ <select name="page_status" id="page-status">
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php _e( 'All' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $post_stati as $status ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,23 +247,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( get_post_types( array( '_builtin' => false, 'can_export' => true ), 'objects' ) as $post_type ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="radio" name="content" value="attachment" /> <?php _e( 'Media' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="attachment-filters" class="export-filters">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php _e( 'Date range:' ); ?></label>
- <select name="attachment_start_date">
- <option value="0"><?php _e( 'Start Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
+ <legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+ <label for="attachment-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+ <select name="attachment_start_date" id="attachment-start-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options( 'attachment' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select name="attachment_end_date">
- <option value="0"><?php _e( 'End Date' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="attachment-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+ <select name="attachment_end_date" id="attachment-end-date">
+ <option value="0"><?php _e( '— Select —' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php export_date_options( 'attachment' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+</fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires after the export filters form.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires at the end of the export filters form.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>