<!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>[38983] trunk/src: Accessibility: Remove inappropriate content from the Posts and Edit screens headings.</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/38983">38983</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/38983","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>2016-10-27 20:38:09 +0000 (Thu, 27 Oct 2016)</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: Remove inappropriate content from the Posts and Edit screens headings.
Props grahamarmfield, SergeyBiryukov, trishasalas, valendesigns, rianrietveld, afercia.
See <a href="https://core.trac.wordpress.org/ticket/26601">#26601</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpincludesjsautosavejs">trunk/src/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></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/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2016-10-27 16:07:06 UTC (rev 38982)
+++ trunk/src/wp-admin/css/common.css 2016-10-27 20:38:09 UTC (rev 38983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,10 +572,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 23px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 400;
</span><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">- padding: 9px 15px 4px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 9px 0 4px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> line-height: 29px;
</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">+.wrap h1.wp-heading-inline {
+ display: inline-block;
+ margin-right: 5px;
+}
+
+.wp-header-end {
+ visibility: hidden;
+ margin: -2px 0 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .subtitle {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-left: 25px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,6 +618,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: 0;
</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">+.wrap .wp-heading-inline + .page-title-action {
+ margin-left: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wrap .add-new-h2:hover, /* deprecated */
</span><span class="cx" style="display: block; padding: 0 10px"> .wrap .page-title-action:hover {
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: #008EC2;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3654,6 +3668,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: none !important;
</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">+ .wrap h1.wp-heading-inline {
+ margin-bottom: 0.5em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wrap .add-new-h2, /* deprecated */
</span><span class="cx" style="display: block; padding: 0 10px"> .wrap .add-new-h2:active, /* deprecated */
</span><span class="cx" style="display: block; padding: 0 10px"> .wrap .page-title-action,
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></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/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2016-10-27 16:07:06 UTC (rev 38982)
+++ trunk/src/wp-admin/edit-form-advanced.php 2016-10-27 20:38:09 UTC (rev 38983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,11 +474,18 @@
</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"> <div class="wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1 class="wp-heading-inline"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $title );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?></h1>
+
+<?php
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+?>
+
+<hr class="wp-header-end">
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $notice ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2016-10-27 16:07:06 UTC (rev 38982)
+++ trunk/src/wp-admin/edit.php 2016-10-27 20:38:09 UTC (rev 38983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,17 +303,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1 class="wp-heading-inline"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $post_type_object->labels->name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( current_user_can( $post_type_object->cap->create_posts ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?></h1>
+
+<?php
+if ( current_user_can( $post_type_object->cap->create_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
</span><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 ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: search keywords */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ' <span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', get_search_query() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?></h1>
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<hr class="wp-header-end">
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If we have a bulk message to issue:
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></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/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2016-10-27 16:07:06 UTC (rev 38982)
+++ trunk/src/wp-admin/js/common.js 2016-10-27 20:38:09 UTC (rev 38983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpwrap: $wpwrap.height(),
</span><span class="cx" style="display: block; padding: 0 10px"> adminbar: $adminbar.height(),
</span><span class="cx" style="display: block; padding: 0 10px"> menu: $adminMenuWrap.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">+ },
+ $headerEnd = $( '.wp-header-end' );
</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"> // when the menu is folded, make the fly-out submenu header clickable
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,8 +397,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The `.below-h2` class is here just for backward compatibility with plugins
</span><span class="cx" style="display: block; padding: 0 10px"> * that are (incorrectly) using it. Do not use. Use `.inline` instead. See #34570.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If '.wp-header-end' is found, append the notices after it otherwise
+ * after the first h1 or h2 heading found within the main content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'div.updated, div.error, div.notice' ).not( '.inline, .below-h2' ).insertAfter( $( '.wrap h1, .wrap h2' ).first() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $headerEnd.length ) {
+ $headerEnd = $( '.wrap h1, .wrap h2' ).first();
+ }
+ $( 'div.updated, div.error, div.notice' ).not( '.inline, .below-h2' ).insertAfter( $headerEnd );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make notices dismissible
</span><span class="cx" style="display: block; padding: 0 10px"> function makeNoticesDismissible() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsautosavejs"></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/js/autosave.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/autosave.js 2016-10-27 16:07:06 UTC (rev 38982)
+++ trunk/src/wp-includes/js/autosave.js 2016-10-27 20:38:09 UTC (rev 38983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +315,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var content, post_title, excerpt, $notice,
</span><span class="cx" style="display: block; padding: 0 10px"> postData = getSavedPostData(),
</span><span class="cx" style="display: block; padding: 0 10px"> cookie = wpCookies.get( 'wp-saving-post' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newerAutosaveNotice = $( '#has-newer-autosave' ).parent( '.notice' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newerAutosaveNotice = $( '#has-newer-autosave' ).parent( '.notice' ),
+ $headerEnd = $( '.wp-header-end' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( cookie === post_id + '-saved' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpCookies.remove( 'wp-saving-post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,8 +339,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ /*
+ * If '.wp-header-end' is found, append the notices after it otherwise
+ * after the first h1 or h2 heading found within the main content.
+ */
+ if ( ! $headerEnd.length ) {
+ $headerEnd = $( '.wrap h1, .wrap h2' ).first();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $notice = $( '#local-storage-notice' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .insertAfter( $( '.wrap h1, .wrap h2' ).first() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .insertAfter( $headerEnd )
</ins><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'notice-warning' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newerAutosaveNotice.length ) {
</span></span></pre>
</div>
</div>
</body>
</html>