<!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>[33130] trunk/src/wp-includes: Toolbar: Disambiguate links to the dashboard vs.</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/33130">33130</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/33130","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-08 20:02:44 +0000 (Wed, 08 Jul 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'>Toolbar: Disambiguate links to the dashboard vs. to the customizer.
All links in the site name menu now point to admin screens, and Customize is its own top-level link. This makes it clear which context you are about to enter.
fixes <a href="https://core.trac.wordpress.org/ticket/32924">#32924</a>. see <a href="https://core.trac.wordpress.org/ticket/32678">#32678</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludescssadminbarcss">trunk/src/wp-includes/css/admin-bar.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesadminbarphp"></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/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2015-07-08 19:53:22 UTC (rev 33129)
+++ trunk/src/wp-includes/admin-bar.php 2015-07-08 20:02:44 UTC (rev 33130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +319,33 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add the "Customize" link.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+ // Don't show for users who can't access the customizer.
+ if ( ! current_user_can( 'customize' ) ) {
+ return;
+ }
+
+ $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'customize',
+ 'title' => __( 'Customize' ),
+ 'href' => $customize_url,
+ 'meta' => array(
+ 'class' => 'hide-if-no-customize',
+ ),
+ ) );
+ add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add the "My Sites/[Site Name]" menu and all submenus.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,46 +691,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
- $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'switch_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'appearance',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'themes',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => admin_url( 'themes.php' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
- 'class' => 'hide-if-customize',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( current_user_can( 'customize' ) ) {
- $wp_admin_bar->add_menu( array(
- 'parent' => 'appearance',
- 'id' => 'customize-themes',
- 'title' => __( 'Themes' ),
- 'href' => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859
- 'meta' => array(
- 'class' => 'hide-if-no-customize',
- ),
- ) );
- }
</del><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">- if ( current_user_can( 'customize' ) ) {
- $wp_admin_bar->add_menu( array(
- 'parent' => 'appearance',
- 'id' => 'customize',
- 'title' => __('Customize'),
- 'href' => $customize_url,
- 'meta' => array(
- 'class' => 'hide-if-no-customize',
- ),
- ) );
- add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,22 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'widgets',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Widgets' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => admin_url( 'widgets.php' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
- 'class' => 'hide-if-customize',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( current_user_can( 'customize' ) ) {
- $wp_admin_bar->add_menu( array(
- 'parent' => 'appearance',
- 'id' => 'customize-widgets',
- 'title' => __( 'Widgets' ),
- 'href' => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859
- 'meta' => array(
- 'class' => 'hide-if-no-customize',
- ),
- ) );
- }
</del><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 ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,18 +726,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'hide-if-customize',
</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">-
- if ( current_user_can( 'customize' ) ) {
- $wp_admin_bar->add_menu( array(
- 'parent' => 'appearance',
- 'id' => 'customize-background',
- 'title' => __( 'Background' ),
- 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'background_image', $customize_url ), // urlencode() needed due to #16859
- 'meta' => array(
- 'class' => 'hide-if-no-customize',
- ),
- ) );
- }
</del><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 ( current_theme_supports( 'custom-header' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,18 +738,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'hide-if-customize',
</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">-
- if ( current_user_can( 'customize' ) ) {
- $wp_admin_bar->add_menu( array(
- 'parent' => 'appearance',
- 'id' => 'customize-header',
- 'title' => __( 'Header' ),
- 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'header_image', $customize_url ), // urlencode() needed due to #16859
- 'meta' => array(
- 'class' => 'hide-if-no-customize',
- ),
- ) );
- }
</del><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></pre></div>
<a id="trunksrcwpincludesclasswpadminbarphp"></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/class-wp-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2015-07-08 19:53:22 UTC (rev 33129)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2015-07-08 20:02:44 UTC (rev 33130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
+ add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Content related.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() && ! is_user_admin() ) {
</span></span></pre></div>
<a id="trunksrcwpincludescssadminbarcss"></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/css/admin-bar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/admin-bar.css 2015-07-08 19:53:22 UTC (rev 33129)
+++ trunk/src/wp-includes/css/admin-bar.css 2015-07-08 20:02:44 UTC (rev 33130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,6 +521,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: 2px;
</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">+#wpadminbar #wp-admin-bar-customize > .ab-item:before {
+ content: '\f540';
+ top: 2px;
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-edit > .ab-item:before {
</span><span class="cx" style="display: block; padding: 0 10px"> content: '\f464';
</span><span class="cx" style="display: block; padding: 0 10px"> top: 2px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -882,6 +888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* My Sites and "Site Title" menu */
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-my-sites > .ab-item,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-site-name > .ab-item,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #wpadminbar #wp-admin-bar-customize > .ab-item,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-edit > .ab-item,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-my-account > .ab-item {
</span><span class="cx" style="display: block; padding: 0 10px"> text-indent: 100%;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,6 +910,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-edit > .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-site-name > .ab-item:before,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #wpadminbar #wp-admin-bar-customize > .ab-item:before,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-my-account > .ab-item:before {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> text-indent: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,6 +1024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-my-sites,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-updates,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-site-name,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #wpadminbar li#wp-admin-bar-customize,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-new-content,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-edit,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li#wp-admin-bar-comments,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,3 +1139,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</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">+
+/* Very narrow screens */
+@media screen and (max-width: 400px) {
+ #wpadminbar li#wp-admin-bar-comments {
+ display: none;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>