<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16077] trunk/wp-includes: Beginnings of new admin bar organization.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16077">16077</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-29 15:17:22 +0000 (Fri, 29 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Beginnings of new admin bar organization. see <a href="http://trac.wordpress.org/ticket/14772">#14772</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbaradminbarclassphp">trunk/wp-includes/admin-bar/admin-bar-class.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbaradminbarclassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-class.php (16076 => 16077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-29 13:58:14 UTC (rev 16076)
+++ trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-29 15:17:22 UTC (rev 16077)
</span><span class="lines">@@ -178,9 +178,10 @@
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
</span><del>- add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 );
- add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_bloginfo_menu', 50 );
- add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 100 );
</del><ins>+ add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 40 );
+ add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_new_content_menu', 50 );
+ add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_comments_menu', 60 );
+ add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_shortlink_menu', 70 );
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() && function_exists('wp_admin_bar_superadmin_settings_menu') )
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_superadmin_settings_menu', 1000 );
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16076 => 16077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-29 13:58:14 UTC (rev 16076)
+++ trunk/wp-includes/admin-bar.php 2010-10-29 15:17:22 UTC (rev 16077)
</span><span class="lines">@@ -80,10 +80,10 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_my_account_menu() {
</span><del>- global $wp_admin_bar;
</del><ins>+ global $wp_admin_bar, $user_identity;
</ins><span class="cx">
</span><span class="cx"> /* Add the 'My Account' menu */
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => __( 'My Account' ), 'href' => admin_url('profile.php'), ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity, 'href' => admin_url('profile.php'), ) );
</ins><span class="cx">
</span><span class="cx"> /* Add the "My Account" sub menus */
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => admin_url('profile.php'), ) );
</span><span class="lines">@@ -100,55 +100,44 @@
</span><span class="cx"> global $wpdb, $wp_admin_bar;
</span><span class="cx">
</span><span class="cx"> /* Add the 'My Dashboards' menu if the user has more than one site. */
</span><del>- if ( count( $wp_admin_bar->user->blogs ) > 1 ) {
- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain, ) );
</del><ins>+ if ( count( $wp_admin_bar->user->blogs ) <= 1 )
+ return;
</ins><span class="cx">
</span><del>- $default = includes_url('images/wpmini-blue.png');
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain, ) );
</ins><span class="cx">
</span><del>- foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
- $blogdomain = preg_replace( '!^https?://!', '', $blog->siteurl );
- // @todo Replace with some favicon lookup.
- //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
- $blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" />';
</del><ins>+ $default = includes_url('images/wpmini-blue.png');
</ins><span class="cx">
</span><del>- $marker = '';
- if ( strlen($blog->blogname) > 35 )
- $marker = '...';
</del><ins>+ foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
+ $blogdomain = preg_replace( '!^https?://!', '', $blog->siteurl );
+ // @todo Replace with some favicon lookup.
+ //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
+ $blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" />';
</ins><span class="cx">
</span><del>- if ( empty( $blog->blogname ) )
- $blogname = $blog->domain;
- else
- $blogname = substr( $blog->blogname, 0, 35 ) . $marker;
</del><ins>+ $marker = '';
+ if ( strlen($blog->blogname) > 35 )
+ $marker = '...';
</ins><span class="cx">
</span><del>- if ( ! isset( $blog->visible ) || $blog->visible === true ) {
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/post-new.php', ) );
</del><ins>+ if ( empty( $blog->blogname ) )
+ $blogname = $blog->domain;
+ else
+ $blogname = substr( $blog->blogname, 0, 35 ) . $marker;
</ins><span class="cx">
</span><del>- // @todo, stats plugins should add this:
- //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/index.php?page=stats' ) );
-
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/edit-comments.php', ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => $wp_admin_bar->proto . $blogdomain, ) );
- }
</del><ins>+ if ( ! isset( $blog->visible ) || $blog->visible === true ) {
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/post-new.php', ) );
+
+ // @todo, stats plugins should add this:
+ //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/index.php?page=stats' ) );
+
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/edit-comments.php', ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => $wp_admin_bar->proto . $blogdomain, ) );
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- /* Add the "Manage Sites" menu item */
- // @todo, use dashboard site.
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Sites' ), admin_url('my-sites.php'), ) );
-
- /* Add the 'My Dashboard' menu if the user only has one site. */
- } else {
- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Site' ), 'href' => $wp_admin_bar->user->account_domain, ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-d', 'title' => __( 'Dashboard' ), 'href' => admin_url(),) );
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-n', 'title' => __( 'New Post' ), 'href' => admin_url('post-new.php'),) );
-
- // @todo Stats plugins should add this.
- //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Site Stats' ), 'href' => admin_url('index.php?page=stats') ) );
-
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-c','title' => __( 'Manage Comments' ), 'href' => admin_url('edit-comments.php'), ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Visit Site' ), 'href' => home_url(),) );
- }
</del><ins>+ /* Add the "Manage Sites" menu item */
+ // @todo, use dashboard site.
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Sites' ), admin_url('my-sites.php'), ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -162,17 +151,19 @@
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . esc_attr__( 'Current site avatar' ) . '" width="16" height="16" />', 'href' => home_url(), ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><del>- * Site info menu
</del><ins>+ * Provide a shortlink.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_bloginfo_menu() {
</del><ins>+function wp_admin_bar_shortlink_menu() {
</ins><span class="cx"> global $wp_admin_bar;
</span><del>-
</del><ins>+
</ins><span class="cx"> $short = wp_get_shortlink( 0, 'query' );
</span><ins>+
</ins><span class="cx"> if ( ! empty( $short) )
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'get-shortlink', 'title' => __( 'Get Shortlink' ), 'href' => '', ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'get-shortlink', 'title' => __( 'Shortlink' ), 'href' => '', ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -180,21 +171,62 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_edit_menu() {
</del><ins>+function wp_admin_bar_edit_menu () {
</ins><span class="cx"> global $wp_admin_bar, $wp_query;
</span><span class="cx">
</span><span class="cx"> $current_object = $wp_query->get_queried_object();
</span><span class="cx">
</span><del>- if ( empty( $current_object ) )
- return false;
</del><ins>+ if ( empty($current_object) )
+ return;
</ins><span class="cx">
</span><ins>+ // @todo Use proper type name in edit strings
</ins><span class="cx"> if ( ! empty( $current_object->post_type ) && ( $post_type_object = get_post_type_object( $current_object->post_type ) ) && current_user_can( $post_type_object->cap->edit_post, $current_object->ID ) ) {
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => __( 'Edit' ), 'href' => get_edit_post_link( $current_object->ID ), ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => __( 'Edit Post' ), 'href' => get_edit_post_link( $current_object->ID ), ) );
</ins><span class="cx"> } elseif ( ! empty( $current_object->taxonomy ) && ( $tax = get_taxonomy( $current_object->taxonomy ) ) && current_user_can( $tax->cap->edit_terms ) ) {
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => __( 'Edit' ), 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy ), ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => __( 'Edit Post' ), 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy ), ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_admin_bar_new_content_menu() {
+ global $wp_admin_bar;
+
+ // @todo Handle CPTs, use post type object for strings
+ $actions = array(
+ 'post-new.php' => array(__('Post'), 'edit_posts', 'new-post'),
+ 'post-new.php?post_type=page' => array(__('Page'), 'edit_pages', 'new-page'),
+ );
+
+ $user_can = false;
+ foreach ( $actions as $action ) {
+ if ( current_user_can($action[1]) ) {
+ $user_can = true;
+ break;
+ }
+ }
+
+ if ( !$user_can )
+ return;
+
+ $wp_admin_bar->add_menu( array( 'id' => 'new-content', 'title' => __( 'New Content' ), 'href' => '', ) );
+
+ foreach ( $actions as $link => $action ) {
+ $wp_admin_bar->add_menu( array( 'parent' => 'new-content', 'id' => $action[2], 'title' => $action[0], 'href' => admin_url($link) ) );
+ }
+}
+
+function wp_admin_bar_comments_menu() {
+ global $wp_admin_bar;
+
+ if ( !current_user_can('edit_posts') )
+ return;
+
+ $awaiting_mod = wp_count_comments();
+ $awaiting_mod = $awaiting_mod->moderated;
+
+ // @todo styling for awaiting mod count. Don't show count if zero?
+ $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'href' => admin_url('comments.php') ) );
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Style and scripts for the admin bar.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>