<!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>[18888] trunk: Revise admin bar items based on user testing.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18888">18888</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2011-10-05 18:45:32 +0000 (Wed, 05 Oct 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revise admin bar items based on user testing. Post at http://wp.me/pbNCB-qz. see <a href="http://core.trac.wordpress.org/ticket/18197">#18197</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminfooterphp">trunk/wp-admin/admin-footer.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-footer.php (18887 => 18888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-footer.php        2011-10-05 17:48:41 UTC (rev 18887)
+++ trunk/wp-admin/admin-footer.php        2011-10-05 18:45:32 UTC (rev 18888)
</span><span class="lines">@@ -21,10 +21,6 @@
</span><span class="cx"> $upgrade = apply_filters( 'update_footer', '' );
</span><span class="cx"> $footer_text = array(
</span><span class="cx">         '&lt;span id=&quot;footer-thankyou&quot;&gt;' . __( 'Thank you for creating with &lt;a href=&quot;http://wordpress.org/&quot;&gt;WordPress&lt;/a&gt;.' ) . '&lt;/span&gt;',
</span><del>-        __( '&lt;a href=&quot;http://codex.wordpress.org/&quot;&gt;Documentation&lt;/a&gt;' ),
-        sprintf( '&lt;a href=&quot;%s&quot;&gt;' . __( 'Freedoms' ) . '&lt;/a&gt;', admin_url( 'freedoms.php' ) ),
-        __('&lt;a href=&quot;http://wordpress.org/support/forum/requests-and-feedback&quot;&gt;Feedback&lt;/a&gt;'),
-        sprintf( '&lt;a href=&quot;%s&quot;&gt;' . __('Credits') . '&lt;/a&gt;', admin_url('credits.php') ),
</del><span class="cx"> );
</span><span class="cx"> echo apply_filters( 'admin_footer_text', implode( ' &amp;bull; ', $footer_text ) );
</span><span class="cx"> unset( $footer_text );
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18887 => 18888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php        2011-10-05 17:48:41 UTC (rev 18887)
+++ trunk/wp-includes/admin-bar.php        2011-10-05 18:45:32 UTC (rev 18888)
</span><span class="lines">@@ -91,17 +91,51 @@
</span><span class="cx">                 ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        // Add freedoms link
+        $wp_admin_bar-&gt;add_menu( array(
+                'parent' =&gt; 'wp-logo',
+                'id'     =&gt; 'freedoms',
+                'title'  =&gt; __('Freedoms'),
+                'href'   =&gt; admin_url('freedoms.php'),
+        ) );
+
+        // Add credits link
+        $wp_admin_bar-&gt;add_menu( array(
+                'parent' =&gt; 'wp-logo',
+                'id'     =&gt; 'credits',
+                'title'  =&gt; __('Credits'),
+                'href'   =&gt; admin_url('credits.php'),
+        ) );
+
+        // Add secondary menu.
+        $wp_admin_bar-&gt;add_menu( array(
+                'parent' =&gt; 'wp-logo',
+                'id'     =&gt; 'wp-logo-secondary',
+                'title'  =&gt; __( '&amp;nbsp;' ),
+                'meta'   =&gt; array(
+                        'class' =&gt; 'secondary',
+                ),
+        ) );
+
</ins><span class="cx">         // Add codex link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo',
</del><ins>+                'parent' =&gt; 'wp-logo-secondary',
</ins><span class="cx">                 'id'     =&gt; 'documentation',
</span><span class="cx">                 'title'  =&gt; __('Documentation'),
</span><span class="cx">                 'href'   =&gt; 'http://codex.wordpress.org',
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><ins>+        // Add feedback link
+        $wp_admin_bar-&gt;add_menu( array(
+                'parent' =&gt; 'wp-logo-secondary',
+                'id'     =&gt; 'feedback',
+                'title'  =&gt; __('Feedback'),
+                'href'   =&gt; 'http://wordpress.org/support/forum/requests-and-feedback',
+        ) );
+
</ins><span class="cx">         // Add forums link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo',
</del><ins>+                'parent' =&gt; 'wp-logo-secondary',
</ins><span class="cx">                 'id'     =&gt; 'support-forums',
</span><span class="cx">                 'title'  =&gt; __('Support Forums'),
</span><span class="cx">                 'href'   =&gt; 'http://wordpress.org/support/',
</span><span class="lines">@@ -109,7 +143,7 @@
</span><span class="cx"> 
</span><span class="cx">         // Add WordPress.org link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo',
</del><ins>+                'parent' =&gt; 'wp-logo-secondary',
</ins><span class="cx">                 'id'     =&gt; 'wporg',
</span><span class="cx">                 'title'  =&gt; __('WordPress.org'),
</span><span class="cx">                 'href'   =&gt; 'http://wordpress.org',
</span><span class="lines">@@ -181,39 +215,10 @@
</span><span class="cx">                                 'class' =&gt; 'user-info-item',
</span><span class="cx">                         ),
</span><span class="cx">                 ) );
</span><del>-
-                $wp_admin_bar-&gt;add_menu( array(
-                        'parent' =&gt; 'my-account',
-                        'id'     =&gt; 'my-account-secondary',
-                        'title'  =&gt; '&amp;nbsp;',
-                        'meta'   =&gt; array(
-                                'class' =&gt; 'secondary',
-                        ),
-                ) );
</del><span class="cx">         }
</span><del>-
-        wp_admin_bar_my_sites_menu( $wp_admin_bar );
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Add the &quot;Network Admin&quot; menu.
- *
- * @since 3.3.0
- */
-function wp_admin_bar_network_admin_menu( $wp_admin_bar ) {
-        if ( is_multisite() &amp;&amp; is_super_admin() &amp;&amp; ! is_network_admin() ) {
-                $wp_admin_bar-&gt;add_menu( array(
-                        'id'    =&gt; 'network-admin',
-                        'title' =&gt; __('Network Admin'),
-                        'href'  =&gt; network_admin_url(),
-                        'meta'  =&gt; array(
-                                'class' =&gt; 'opposite',
-                        ),
-                ) );
-        }
-}
-
-/**
</del><span class="cx">  * Add the &quot;Blog Name&quot; menu in the front end.
</span><span class="cx">  *
</span><span class="cx">  * @since 3.3.0
</span><span class="lines">@@ -279,6 +284,13 @@
</span><span class="cx">                 'title' =&gt; $title_excerpt,
</span><span class="cx">                 'href'  =&gt; $url,
</span><span class="cx">         ) );
</span><ins>+
+        $wp_admin_bar-&gt;add_menu( array(
+                'parent' =&gt; 'blog-name',
+                'id'     =&gt; 'view-site',
+                'title'  =&gt; __( 'Visit Site' ),
+                'href'   =&gt; home_url(),
+        ) );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -289,59 +301,91 @@
</span><span class="cx"> function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
</span><span class="cx">         global $wpdb;
</span><span class="cx"> 
</span><del>-        if ( is_user_logged_in() ) {
-                // Add blog links
-                $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
</del><ins>+        // Don't show for logged out users or single site mode.
+        if ( ! is_user_logged_in() || ! is_multisite() )
+                return;
</ins><span class="cx"> 
</span><del>-                foreach ( (array) $wp_admin_bar-&gt;user-&gt;blogs as $blog ) {
-                        // Skip the current blog (unless we're in the network/user admin).
-                        if ( $blog-&gt;userblog_id == get_current_blog_id() &amp;&amp; ! is_network_admin() &amp;&amp; ! is_user_admin() ) {
-                                continue;
-                        }
</del><ins>+        // Show only when there are more than two items in the menu.
+        if ( count( $wp_admin_bar-&gt;user-&gt;blogs ) &lt;= 1 &amp;&amp; ! is_super_admin() )
+                return;
</ins><span class="cx"> 
</span><del>-                        // @todo Replace with some favicon lookup.
-                        //$blavatar = '&lt;img src=&quot;' . esc_url( blavatar_url( blavatar_domain( $blog-&gt;siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '&quot; alt=&quot;Blavatar&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';
-                        $blavatar = '&lt;img src=&quot;' . esc_url($blue_wp_logo_url) . '&quot; alt=&quot;' . esc_attr__( 'Blavatar' ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; class=&quot;blavatar&quot;/&gt;';
</del><ins>+        $wp_admin_bar-&gt;add_menu( array(
+                'id'    =&gt; 'my-sites',
+                'title' =&gt; __( 'My Sites' ),
+                'href'  =&gt; admin_url( 'my-sites.php' ),
+        ) );
</ins><span class="cx"> 
</span><del>-                        $blogname = empty( $blog-&gt;blogname ) ? $blog-&gt;domain : $blog-&gt;blogname;
-                        $menu_id  = 'blog-' . $blog-&gt;userblog_id;
</del><ins>+        if ( is_super_admin() ) {
+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent' =&gt; 'my-sites',
+                        'id'     =&gt; 'network-admin',
+                        'title'  =&gt; __('Network Admin'),
+                        'href'   =&gt; network_admin_url(),
+                ) );
+        }
</ins><span class="cx"> 
</span><del>-                        $wp_admin_bar-&gt;add_menu( array(
-                                'parent' =&gt; 'my-account-secondary',
-                                'id'     =&gt; $menu_id,
-                                'title'  =&gt; $blavatar . $blogname,
-                                'href'   =&gt; get_admin_url( $blog-&gt;userblog_id ),
-                        ) );
</del><ins>+        if ( $wp_admin_bar-&gt;user-&gt;blogs ) {
+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent' =&gt; 'my-sites',
+                        'id'     =&gt; 'my-sites-secondary',
+                        'title'  =&gt; '&amp;nbsp;',
+                        'meta'   =&gt; array(
+                                'class' =&gt; 'secondary',
+                        ),
+                ) );
+        }
</ins><span class="cx"> 
</span><ins>+        // Add blog links
+        $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
+
+        foreach ( (array) $wp_admin_bar-&gt;user-&gt;blogs as $blog ) {
+                // Skip the current blog (unless we're in the network/user admin).
+                if ( $blog-&gt;userblog_id == get_current_blog_id() &amp;&amp; ! is_network_admin() &amp;&amp; ! is_user_admin() ) {
+                        continue;
+                }
+
+                // @todo Replace with some favicon lookup.
+                //$blavatar = '&lt;img src=&quot;' . esc_url( blavatar_url( blavatar_domain( $blog-&gt;siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '&quot; alt=&quot;Blavatar&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';
+                $blavatar = '&lt;img src=&quot;' . esc_url($blue_wp_logo_url) . '&quot; alt=&quot;' . esc_attr__( 'Blavatar' ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; class=&quot;blavatar&quot;/&gt;';
+
+                $blogname = empty( $blog-&gt;blogname ) ? $blog-&gt;domain : $blog-&gt;blogname;
+                $menu_id  = 'blog-' . $blog-&gt;userblog_id;
+
+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent' =&gt; 'my-sites-secondary',
+                        'id'     =&gt; $menu_id,
+                        'title'  =&gt; $blavatar . $blogname,
+                        'href'   =&gt; get_admin_url( $blog-&gt;userblog_id ),
+                ) );
+
+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent' =&gt; $menu_id,
+                        'id'     =&gt; $menu_id . '-d',
+                        'title'  =&gt; __( 'Dashboard' ),
+                        'href'   =&gt; get_admin_url( $blog-&gt;userblog_id ),
+                ) );
+
+                if ( current_user_can_for_blog( $blog-&gt;userblog_id, 'edit_posts' ) ) {
</ins><span class="cx">                         $wp_admin_bar-&gt;add_menu( array(
</span><span class="cx">                                 'parent' =&gt; $menu_id,
</span><del>-                                'id'     =&gt; $menu_id . '-d',
-                                'title'  =&gt; __( 'Dashboard' ),
-                                'href'   =&gt; get_admin_url( $blog-&gt;userblog_id ),
</del><ins>+                                'id'     =&gt; $menu_id . '-n',
+                                'title'  =&gt; __( 'New Post' ),
+                                'href'   =&gt; get_admin_url( $blog-&gt;userblog_id, 'post-new.php' ),
</ins><span class="cx">                         ) );
</span><del>-
-                        if ( current_user_can_for_blog( $blog-&gt;userblog_id, 'edit_posts' ) ) {
-                                $wp_admin_bar-&gt;add_menu( array(
-                                        'parent' =&gt; $menu_id,
-                                        'id'     =&gt; $menu_id . '-n',
-                                        'title'  =&gt; __( 'New Post' ),
-                                        'href'   =&gt; get_admin_url( $blog-&gt;userblog_id, 'post-new.php' ),
-                                ) );
-                                $wp_admin_bar-&gt;add_menu( array(
-                                        'parent' =&gt; $menu_id,
-                                        'id'     =&gt; $menu_id . '-c',
-                                        'title'  =&gt; __( 'Manage Comments' ),
-                                        'href'   =&gt; get_admin_url( $blog-&gt;userblog_id, 'edit-comments.php' ),
-                                ) );
-                        }
-
</del><span class="cx">                         $wp_admin_bar-&gt;add_menu( array(
</span><span class="cx">                                 'parent' =&gt; $menu_id,
</span><del>-                                'id'     =&gt; $menu_id . '-v',
-                                'title'  =&gt; __( 'Visit Site' ),
-                                'href'   =&gt; get_home_url( $blog-&gt;userblog_id ),
</del><ins>+                                'id'     =&gt; $menu_id . '-c',
+                                'title'  =&gt; __( 'Manage Comments' ),
+                                'href'   =&gt; get_admin_url( $blog-&gt;userblog_id, 'edit-comments.php' ),
</ins><span class="cx">                         ) );
</span><span class="cx">                 }
</span><ins>+
+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent' =&gt; $menu_id,
+                        'id'     =&gt; $menu_id . '-v',
+                        'title'  =&gt; __( 'Visit Site' ),
+                        'href'   =&gt; get_home_url( $blog-&gt;userblog_id ),
+                ) );
</ins><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (18887 => 18888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php        2011-10-05 17:48:41 UTC (rev 18887)
+++ trunk/wp-includes/class-wp-admin-bar.php        2011-10-05 18:45:32 UTC (rev 18888)
</span><span class="lines">@@ -175,12 +175,12 @@
</span><span class="cx">         function add_menus() {
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
</span><ins>+                add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
</ins><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 );
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 );
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 );
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
</span><span class="cx">                 add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
</span><del>-                add_action( 'admin_bar_menu', 'wp_admin_bar_network_admin_menu', 80 );
</del><span class="cx"> 
</span><span class="cx">                 if ( ! is_admin() ) {
</span><span class="cx">                         add_action( 'admin_bar_menu', 'wp_admin_bar_blog_front_menu', 25 );
</span></span></pre>
</div>
</div>

</body>
</html>