/**
* Instantiate the admin bar object and set it up as a global for access elsewhere.
*
- * To hide the admin bar, you're looking in the wrong place. Unhooking this function will not
- * properly remove the admin bar. For that, use show_admin_bar(false) or the show_admin_bar filter.
+ * UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
+ * For that, use show_admin_bar(false) or the 'show_admin_bar' filter.
*
* @since 3.1.0
* @access private
require( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
/* Instantiate the admin bar */
+
+ /**
+ * Filter the admin bar class to instantiate.
+ *
+ * @since 3.1.0
+ *
+ * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
+ */
$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
if ( class_exists( $admin_bar_class ) )
$wp_admin_bar = new $admin_bar_class;
return true;
}
-add_action( 'init', '_wp_admin_bar_init' ); // Don't remove. Wrong way to disable.
+// Don't remove. Wrong way to disable.
+add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
+add_action( 'admin_init', '_wp_admin_bar_init' );
/**
* Render the admin bar to the page based on the $wp_admin_bar->menu member var.
if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
return false;
- $wp_admin_bar->load_user_locale_translations();
-
+ /**
+ * Load all necessary admin bar items.
+ *
+ * This is the hook used to add, remove, or manipulate admin bar items.
+ *
+ * @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
+ */
do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+ /**
+ * Fires before the admin bar is rendered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_before_admin_bar_render' );
$wp_admin_bar->render();
+ /**
+ * Fires after the admin bar is rendered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_after_admin_bar_render' );
-
- $wp_admin_bar->unload_user_locale_translations();
}
add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-add_action( 'admin_footer', 'wp_admin_bar_render', 1000 );
+add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
+
+/**
+ * Add the WordPress logo menu.
+ *
+ * @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_wp_menu( $wp_admin_bar ) {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'wp-logo',
+ 'title' => '<span class="ab-icon"></span>',
+ 'href' => self_admin_url( 'about.php' ),
+ 'meta' => array(
+ 'title' => __('About WordPress'),
+ ),
+ ) );
+
+ if ( is_user_logged_in() ) {
+ // Add "About WordPress" link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo',
+ 'id' => 'about',
+ 'title' => __('About WordPress'),
+ 'href' => self_admin_url( 'about.php' ),
+ ) );
+ }
+
+ // Add WordPress.org link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo-external',
+ 'id' => 'wporg',
+ 'title' => __('WordPress.org'),
+ 'href' => __('https://wordpress.org/'),
+ ) );
+
+ // Add codex link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo-external',
+ 'id' => 'documentation',
+ 'title' => __('Documentation'),
+ 'href' => __('http://codex.wordpress.org/'),
+ ) );
+
+ // Add forums link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo-external',
+ 'id' => 'support-forums',
+ 'title' => __('Support Forums'),
+ 'href' => __('https://wordpress.org/support/'),
+ ) );
+
+ // Add feedback link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo-external',
+ 'id' => 'feedback',
+ 'title' => __('Feedback'),
+ 'href' => __('https://wordpress.org/support/forum/requests-and-feedback'),
+ ) );
+}
/**
- * Add the "My Account" menu and all submenus.
+ * Add the sidebar toggle button.
+ *
+ * @since 3.8.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
+ if ( is_admin() ) {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'menu-toggle',
+ 'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+ 'href' => '#',
+ ) );
+ }
+}
+
+/**
+ * Add the "My Account" item.
+ *
+ * @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_my_account_item( $wp_admin_bar ) {
+ $user_id = get_current_user_id();
+ $current_user = wp_get_current_user();
+ $profile_url = get_edit_profile_url( $user_id );
+
+ if ( ! $user_id )
+ return;
+
+ $avatar = get_avatar( $user_id, 26 );
+ $howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name );
+ $class = empty( $avatar ) ? '' : 'with-avatar';
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'my-account',
+ 'parent' => 'top-secondary',
+ 'title' => $howdy . $avatar,
+ 'href' => $profile_url,
+ 'meta' => array(
+ 'class' => $class,
+ 'title' => __('My Account'),
+ ),
+ ) );
+}
+
+/**
+ * Add the "My Account" submenu items.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_my_account_menu() {
- global $wp_admin_bar, $user_identity;
+function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
+ $user_id = get_current_user_id();
+ $current_user = wp_get_current_user();
+ $profile_url = get_edit_profile_url( $user_id );
- $user_id = get_current_user_id();
+ if ( ! $user_id )
+ return;
+
+ $wp_admin_bar->add_group( array(
+ 'parent' => 'my-account',
+ 'id' => 'user-actions',
+ ) );
- if ( 0 != $user_id ) {
- /* Add the 'My Account' menu */
- $avatar = get_avatar( get_current_user_id(), 16 );
- $id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account';
+ $user_info = get_avatar( $user_id, 64 );
+ $user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
- $wp_admin_bar->add_menu( array( 'id' => $id, 'title' => $avatar . $user_identity, 'href' => get_edit_profile_url( $user_id ) ) );
+ if ( $current_user->display_name !== $current_user->user_login )
+ $user_info .= "<span class='username'>{$current_user->user_login}</span>";
- /* Add the "My Account" sub menus */
- $wp_admin_bar->add_menu( array( 'parent' => $id, 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) );
- if ( is_multisite() )
- $wp_admin_bar->add_menu( array( 'parent' => $id, 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
- else
- $wp_admin_bar->add_menu( array( 'parent' => $id, 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
- $wp_admin_bar->add_menu( array( 'parent' => $id, 'title' => __( 'Log Out' ), 'href' => wp_logout_url() ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'user-actions',
+ 'id' => 'user-info',
+ 'title' => $user_info,
+ 'href' => $profile_url,
+ 'meta' => array(
+ 'tabindex' => -1,
+ ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'user-actions',
+ 'id' => 'edit-profile',
+ 'title' => __( 'Edit My Profile' ),
+ 'href' => $profile_url,
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'user-actions',
+ 'id' => 'logout',
+ 'title' => __( 'Log Out' ),
+ 'href' => wp_logout_url(),
+ ) );
+}
+
+/**
+ * Add the "Site Name" menu.
+ *
+ * @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_site_menu( $wp_admin_bar ) {
+ // Don't show for logged out users.
+ if ( ! is_user_logged_in() )
+ return;
+
+ // Show only when the user is a member of this site, or they're a super admin.
+ if ( ! is_user_member_of_blog() && ! is_super_admin() )
+ return;
+
+ $blogname = get_bloginfo('name');
+
+ if ( empty( $blogname ) )
+ $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+
+ if ( is_network_admin() ) {
+ $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
+ } elseif ( is_user_admin() ) {
+ $blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) );
+ }
+
+ $title = wp_html_excerpt( $blogname, 40, '…' );
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'site-name',
+ 'title' => $title,
+ 'href' => is_admin() ? home_url( '/' ) : admin_url(),
+ ) );
+
+ // Create submenu items.
+
+ if ( is_admin() ) {
+ // Add an option to visit the site.
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'site-name',
+ 'id' => 'view-site',
+ 'title' => __( 'Visit Site' ),
+ 'href' => home_url( '/' ),
+ ) );
+
+ if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'site-name',
+ 'id' => 'edit-site',
+ 'title' => __( 'Edit Site' ),
+ 'href' => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
+ ) );
+ }
+
+ } else {
+ // We're on the front end, link to the Dashboard.
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'site-name',
+ 'id' => 'dashboard',
+ 'title' => __( 'Dashboard' ),
+ 'href' => admin_url(),
+ ) );
+
+ // Add the appearance submenu items.
+ wp_admin_bar_appearance_menu( $wp_admin_bar );
}
}
* Add the "My Sites/[Site Name]" menu and all submenus.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_my_sites_menu() {
- global $wpdb, $wp_admin_bar;
+function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
+ // Don't show for logged out users or single site mode.
+ if ( ! is_user_logged_in() || ! is_multisite() )
+ return;
- /* Add the 'My Sites' menu if the user has more than one site. */
- if ( count( $wp_admin_bar->user->blogs ) <= 1 )
+ // Show only when the user has at least one site, or they're a super admin.
+ if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
return;
- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => admin_url( 'my-sites.php' ) ) );
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'my-sites',
+ 'title' => __( 'My Sites' ),
+ 'href' => admin_url( 'my-sites.php' ),
+ ) );
+
+ if ( is_super_admin() ) {
+ $wp_admin_bar->add_group( array(
+ 'parent' => 'my-sites',
+ 'id' => 'my-sites-super-admin',
+ ) );
+
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'my-sites-super-admin',
+ 'id' => 'network-admin',
+ 'title' => __('Network Admin'),
+ 'href' => network_admin_url(),
+ ) );
+
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-d',
+ 'title' => __( 'Dashboard' ),
+ 'href' => network_admin_url(),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-s',
+ 'title' => __( 'Sites' ),
+ 'href' => network_admin_url( 'sites.php' ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-u',
+ 'title' => __( 'Users' ),
+ 'href' => network_admin_url( 'users.php' ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-t',
+ 'title' => __( 'Themes' ),
+ 'href' => network_admin_url( 'themes.php' ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-p',
+ 'title' => __( 'Plugins' ),
+ 'href' => network_admin_url( 'plugins.php' ),
+ ) );
+ }
- $default = includes_url('images/wpmini-blue.png');
+ // Add site links
+ $wp_admin_bar->add_group( array(
+ 'parent' => 'my-sites',
+ 'id' => 'my-sites-list',
+ 'meta' => array(
+ 'class' => is_super_admin() ? 'ab-sub-secondary' : '',
+ ),
+ ) );
foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
- // @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" class="blavatar"/>';
+ switch_to_blog( $blog->userblog_id );
- $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
+ $blavatar = '<div class="blavatar"></div>';
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id) ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id) ) );
+ $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
+ $menu_id = 'blog-' . $blog->userblog_id;
+
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'my-sites-list',
+ 'id' => $menu_id,
+ 'title' => $blavatar . $blogname,
+ 'href' => admin_url(),
+ ) );
+
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $menu_id,
+ 'id' => $menu_id . '-d',
+ 'title' => __( 'Dashboard' ),
+ 'href' => admin_url(),
+ ) );
+
+ if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $menu_id,
+ 'id' => $menu_id . '-n',
+ 'title' => __( 'New Post' ),
+ 'href' => admin_url( 'post-new.php' ),
+ ) );
+ }
- if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url($blog->userblog_id, 'post-new.php') ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url($blog->userblog_id, 'edit-comments.php') ) );
+ if ( current_user_can( 'edit_posts' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $menu_id,
+ 'id' => $menu_id . '-c',
+ 'title' => __( 'Manage Comments' ),
+ 'href' => admin_url( 'edit-comments.php' ),
+ ) );
}
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url($blog->userblog_id) ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $menu_id,
+ 'id' => $menu_id . '-v',
+ 'title' => __( 'Visit Site' ),
+ 'href' => home_url( '/' ),
+ ) );
+
+ restore_current_blog();
}
}
* Provide a shortlink.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_shortlink_menu() {
- global $wp_admin_bar;
-
+function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
$short = wp_get_shortlink( 0, 'query' );
$id = 'get-shortlink';
* Provide an edit link for posts and terms.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_edit_menu () {
- global $wp_admin_bar;
-
- $current_object = get_queried_object();
-
- if ( empty($current_object) )
- return;
-
- 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 ) && $post_type_object->show_ui ) {
- $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $post_type_object->labels->edit_item, 'href' => get_edit_post_link( $current_object->ID ) ) );
- } elseif ( ! empty( $current_object->taxonomy ) && ( $tax = get_taxonomy( $current_object->taxonomy ) ) && current_user_can( $tax->cap->edit_terms ) && $tax->show_ui ) {
- $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $tax->labels->edit_item, 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) ) );
+function wp_admin_bar_edit_menu( $wp_admin_bar ) {
+ global $tag, $wp_the_query;
+
+ if ( is_admin() ) {
+ $current_screen = get_current_screen();
+ $post = get_post();
+
+ if ( 'post' == $current_screen->base
+ && 'add' != $current_screen->action
+ && ( $post_type_object = get_post_type_object( $post->post_type ) )
+ && current_user_can( 'read_post', $post->ID )
+ && ( $post_type_object->public )
+ && ( $post_type_object->show_in_admin_bar ) )
+ {
+ if( 'draft' == $post->post_status ) {
+ $preview_link = set_url_scheme( get_permalink( $post->ID ) );
+ /** This filter is documented in wp-admin/includes/meta-boxes.php */
+ $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'preview',
+ 'title' => $post_type_object->labels->view_item,
+ 'href' => esc_url( $preview_link ),
+ 'meta' => array( 'target' => 'wp-preview-' . $post->ID ),
+ ) );
+ } else {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'view',
+ 'title' => $post_type_object->labels->view_item,
+ 'href' => get_permalink( $post->ID )
+ ) );
+ }
+ } elseif ( 'edit-tags' == $current_screen->base
+ && isset( $tag ) && is_object( $tag )
+ && ( $tax = get_taxonomy( $tag->taxonomy ) )
+ && $tax->public )
+ {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'view',
+ 'title' => $tax->labels->view_item,
+ 'href' => get_term_link( $tag )
+ ) );
+ }
+ } else {
+ $current_object = $wp_the_query->get_queried_object();
+
+ if ( empty( $current_object ) )
+ return;
+
+ if ( ! empty( $current_object->post_type )
+ && ( $post_type_object = get_post_type_object( $current_object->post_type ) )
+ && current_user_can( 'edit_post', $current_object->ID )
+ && $post_type_object->show_ui && $post_type_object->show_in_admin_bar )
+ {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'edit',
+ 'title' => $post_type_object->labels->edit_item,
+ 'href' => get_edit_post_link( $current_object->ID )
+ ) );
+ } elseif ( ! empty( $current_object->taxonomy )
+ && ( $tax = get_taxonomy( $current_object->taxonomy ) )
+ && current_user_can( $tax->cap->edit_terms )
+ && $tax->show_ui )
+ {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'edit',
+ 'title' => $tax->labels->edit_item,
+ 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy )
+ ) );
+ }
}
}
* Add "Add New" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_new_content_menu() {
- global $wp_admin_bar;
-
+function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
$actions = array();
- foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) {
- if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
+
+ $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
+
+ if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
+ $actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+
+ if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
+ $actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+
+ if ( current_user_can( 'manage_links' ) )
+ $actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+
+ if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
+ $actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+
+ unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
+
+ // Add any additional custom post types.
+ foreach ( $cpts as $cpt ) {
+ if ( ! current_user_can( $cpt->cap->create_posts ) )
continue;
- $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
+ $key = 'post-new.php?post_type=' . $cpt->name;
+ $actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
}
+ // Avoid clash with parent node and a 'content' post type.
+ if ( isset( $actions['post-new.php?post_type=content'] ) )
+ $actions['post-new.php?post_type=content'][1] = 'add-new-content';
+
+ if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
+ $actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
- if ( empty( $actions ) )
+ if ( ! $actions )
return;
- $wp_admin_bar->add_menu( array( 'id' => 'new-content', 'title' => _x( 'Add New', 'admin bar menu group label' ), 'href' => admin_url( array_shift( array_keys( $actions ) ) ) ) );
+ $title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'new-content',
+ 'title' => $title,
+ 'href' => admin_url( current( array_keys( $actions ) ) ),
+ 'meta' => array(
+ 'title' => _x( 'Add New', 'admin bar menu group label' ),
+ ),
+ ) );
foreach ( $actions as $link => $action ) {
- $wp_admin_bar->add_menu( array( 'parent' => 'new-content', 'id' => $action[2], 'title' => $action[0], 'href' => admin_url($link) ) );
+ list( $title, $id ) = $action;
+
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'new-content',
+ 'id' => $id,
+ 'title' => $title,
+ 'href' => admin_url( $link )
+ ) );
}
}
* Add edit comments link with awaiting moderation count bubble.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_comments_menu() {
- global $wp_admin_bar;
-
+function wp_admin_bar_comments_menu( $wp_admin_bar ) {
if ( !current_user_can('edit_posts') )
return;
$awaiting_mod = wp_count_comments();
$awaiting_mod = $awaiting_mod->moderated;
+ $awaiting_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) );
- $awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod' class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span>" : '';
- $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.php') ) );
+ $icon = '<span class="ab-icon"></span>';
+ $title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '">' . number_format_i18n( $awaiting_mod ) . '</span>';
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'comments',
+ 'title' => $icon . $title,
+ 'href' => admin_url('edit-comments.php'),
+ 'meta' => array( 'title' => $awaiting_title ),
+ ) );
}
/**
- * Add "Appearance" menu with widget and nav menu submenu.
+ * Add appearance submenu items to the "Site Name" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_appearance_menu() {
- global $wp_admin_bar;
+function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
+ $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
- if ( !current_user_can('switch_themes') )
- return;
-
- $wp_admin_bar->add_menu( array( 'id' => 'appearance', 'title' => __('Appearance'), 'href' => admin_url('themes.php') ) );
+ if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
+ $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
- if ( !current_user_can('edit_theme_options') )
+ if ( ! current_user_can( 'edit_theme_options' ) )
return;
+ if ( current_user_can( 'customize' ) ) {
+ $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'appearance',
+ 'id' => 'customize',
+ 'title' => __('Customize'),
+ 'href' => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
+ 'meta' => array(
+ 'class' => 'hide-if-no-customize',
+ ),
+ ) );
+ add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+ }
+
if ( current_theme_supports( 'widgets' ) )
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
- if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+ if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+
+ if ( current_theme_supports( 'custom-background' ) )
+ $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
+
+ if ( current_theme_supports( 'custom-header' ) )
+ $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
}
/**
* Provide an update link if theme/plugin/core updates are available.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
-function wp_admin_bar_updates_menu() {
- global $wp_admin_bar;
+function wp_admin_bar_updates_menu( $wp_admin_bar ) {
- if ( !current_user_can('install_plugins') )
+ $update_data = wp_get_update_data();
+
+ if ( !$update_data['counts']['total'] )
return;
- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
- $update_plugins = get_site_transient( 'update_plugins' );
- if ( !empty($update_plugins->response) )
- $plugin_update_count = count( $update_plugins->response );
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty($update_themes->response) )
- $theme_update_count = count( $update_themes->response );
- /* @todo get_core_updates() is only available on admin page loads
- $update_wordpress = get_core_updates( array('dismissed' => false) );
- if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
- $wordpress_update_count = 1;
- */
-
- $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
-
- if ( !$update_count )
+ $title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
+ $title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
+
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'updates',
+ 'title' => $title,
+ 'href' => network_admin_url( 'update-core.php' ),
+ 'meta' => array(
+ 'title' => $update_data['title'],
+ ),
+ ) );
+}
+
+/**
+ * Add search form.
+ *
+ * @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_search_menu( $wp_admin_bar ) {
+ if ( is_admin() )
return;
- $update_title = array();
- if ( $wordpress_update_count )
- $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
- if ( $plugin_update_count )
- $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $plugin_update_count), $plugin_update_count);
- if ( $theme_update_count )
- $update_title[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
+ $form = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
+ $form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
+ $form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
+ $form .= '</form>';
- $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'top-secondary',
+ 'id' => 'search',
+ 'title' => $form,
+ 'meta' => array(
+ 'class' => 'admin-bar-search',
+ 'tabindex' => -1,
+ )
+ ) );
+}
- $update_title = "<span title='$update_title'>";
- $update_title .= sprintf( __('Updates %s'), "<span id='ab-updates' class='update-count'>" . number_format_i18n($update_count) . '</span>' );
- $update_title .= '</span>';
+/**
+ * Add secondary menus.
+ *
+ * @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
+ $wp_admin_bar->add_group( array(
+ 'id' => 'top-secondary',
+ 'meta' => array(
+ 'class' => 'ab-top-secondary',
+ ),
+ ) );
- $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => network_admin_url( 'update-core.php' ) ) );
+ $wp_admin_bar->add_group( array(
+ 'parent' => 'wp-logo',
+ 'id' => 'wp-logo-external',
+ 'meta' => array(
+ 'class' => 'ab-sub-secondary',
+ ),
+ ) );
}
/**
* Style and scripts for the admin bar.
*
* @since 3.1.0
- *
*/
function wp_admin_bar_header() { ?>
<style type="text/css" media="print">#wpadminbar { display:none; }</style>
* Default admin bar callback.
*
* @since 3.1.0
- *
*/
function _admin_bar_bump_cb() { ?>
-<style type="text/css">
- html { margin-top: 28px !important; }
- * html body { margin-top: 28px !important; }
+<style type="text/css" media="screen">
+ html { margin-top: 32px !important; }
+ * html body { margin-top: 32px !important; }
+ @media screen and ( max-width: 782px ) {
+ html { margin-top: 46px !important; }
+ * html body { margin-top: 46px !important; }
+ }
</style>
<?php
}
/**
- * Set the display status of the admin bar
+ * Set the display status of the admin bar.
*
- * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
+ * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
*
* @since 3.1.0
*
function is_admin_bar_showing() {
global $show_admin_bar, $pagenow;
- /* For all these types of request we never want an admin bar period */
- if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+ // For all these types of requests, we never want an admin bar.
+ if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
return false;
+ // Integrated into the admin.
+ if ( is_admin() )
+ return true;
+
if ( ! isset( $show_admin_bar ) ) {
if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
$show_admin_bar = false;
} else {
- $context = is_admin() ? 'admin' : 'front';
- $show_admin_bar = _get_admin_bar_pref( $context );
+ $show_admin_bar = _get_admin_bar_pref();
}
}
+ /**
+ * Filter whether to show the admin bar.
+ *
+ * Returning false to this hook is the recommended way to hide the admin bar.
+ * The user's display preference is used for logged in users.
+ *
+ * @since 3.1.0
+ *
+ * @param bool $show_admin_bar Whether the admin bar should be shown. Default false.
+ */
$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
return $show_admin_bar;
}
/**
- * Retrieve the admin bar display preference of a user based on context.
+ * Retrieve the admin bar display preference of a user.
*
* @since 3.1.0
* @access private
*
- * @param string $context Context of this preference check, either 'admin' or 'front'
- * @param int $user Optional. ID of the user to check, defaults to 0 for current user
- * @return bool Whether the admin bar should be showing for this user
+ * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
+ * preference is no longer used.
+ * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
+ * @return bool Whether the admin bar should be showing for this user.
*/
-function _get_admin_bar_pref( $context, $user = 0 ) {
+function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
$pref = get_user_option( "show_admin_bar_{$context}", $user );
if ( false === $pref )
- return 'admin' != $context || is_multisite();
+ return true;
return 'true' === $pref;
}
-
-?>
\ No newline at end of file
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff