From 302259ee138d901a00632cd3abb9ad458d762eef Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 9 Oct 2010 12:22:00 +0000 Subject: [PATCH] s/blog/site/ on the admin bar code. props markmcwilliams, see #14772. git-svn-id: http://svn.automattic.com/wordpress/trunk@15769 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 36 +++++++++---------- .../admin-bar/admin-bar-superadmin.php | 14 ++++---- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 1204012377..94d2da32f4 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -102,7 +102,7 @@ function wp_admin_bar_my_account_menu() { add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 ); /** - * Use the $wp_admin_bar global to add the "My Blogs/[Blog Name]" menu and all submenus. + * Use the $wp_admin_bar global to add the "My Sites/[Site Name]" menu and all submenus. */ function wp_admin_bar_my_blogs_menu() { global $wpdb, $wp_admin_bar; @@ -110,9 +110,9 @@ function wp_admin_bar_my_blogs_menu() { if ( !is_object( $wp_admin_bar ) ) return false; - /* Add the 'My Dashboards' menu if the user has more than one blog. */ + /* Add the 'My Dashboards' menu if the user has more than one site. */ if ( count( $wp_admin_bar->user->blogs ) > 1 ) { - $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) ); + $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain ) ); $default = includes_url('images/wpmini-blue.png'); @@ -137,33 +137,33 @@ function wp_admin_bar_my_blogs_menu() { $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => constant( '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' => constant( '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' => __( 'Blog Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) ); + //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => constant( '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' => constant( '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' => __( 'Read Blog' ), 'href' => constant( 'PROTO' ) . $blogdomain ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Site' ), 'href' => constant( 'PROTO' ) . $blogdomain ) ); } $counter++; } - /* Add the "Manage Blogs" menu item */ - // @todo, use dashboard blog. - $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Blogs' ), admin_url('my-sites.php') ) ); + /* 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 blog. */ + /* Add the 'My Dashboard' menu if the user only has one site. */ } else { - $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blog' ), 'href' => $wp_admin_bar->user->account_domain ) ); + $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' => __( 'Blog Stats' ), 'href' => admin_ur;('index.php?page=stats') ) ); + //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Site Stats' ), 'href' => admin_ur;('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' => __( 'Read Blog' ), 'href' => home_url() ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Site' ), 'href' => home_url() ) ); } } add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 ); /** - * Show the blavatar of the current blog as a separator. + * Show the blavatar of the current site as a separator. */ function wp_admin_bar_blog_separator() { global $wp_admin_bar, $current_user, $current_blog; @@ -173,12 +173,12 @@ function wp_admin_bar_blog_separator() { $default = includes_url('images/wpmini-blue.png'); - $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '' . __( 'Current blog avatar' ) . '', 'href' => home_url() ) ); + $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '' . __( 'Current site avatar' ) . '', 'href' => home_url() ) ); } add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 ); /** - * Use the $wp_admin_bar global to add a menu for blog info, accessable to all users. + * Use the $wp_admin_bar global to add a menu for site info, accessable to all users. */ function wp_admin_bar_bloginfo_menu() { global $wp_admin_bar; @@ -186,8 +186,8 @@ function wp_admin_bar_bloginfo_menu() { if ( !is_object( $wp_admin_bar ) ) return false; - /* Add the Blog Info menu */ - $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Blog Info' ), 'href' => '' ) ); + /* Add the Site Info menu */ + $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '' ) ); $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName('link');var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute('rel')=='shortlink') {found=l.getAttribute('href');break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute('rel') == 'shortlink') {found = l.getAttribute('href');break;}}}if (found) {prompt('URL:', found);} else {alert('No shortlink available for this page'); } } wpcomshort(); return false;' ) ) ); } @@ -332,4 +332,4 @@ function wp_admin_bar_lang($locale) { } add_filter('locale', 'wp_admin_bar_lang'); -?> +?> \ No newline at end of file diff --git a/wp-includes/admin-bar/admin-bar-superadmin.php b/wp-includes/admin-bar/admin-bar-superadmin.php index c93e6a3449..c58fb42d0e 100644 --- a/wp-includes/admin-bar/admin-bar-superadmin.php +++ b/wp-includes/admin-bar/admin-bar-superadmin.php @@ -29,17 +29,17 @@ function wp_admin_bar_superadmin_settings_menu() { wp_admin_bar_build_snackmenu(); - /* Get the settings we need for the current blog */ + /* Get the settings we need for the current site */ $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog'; $maturetext = $current_blog->mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature'); - $suspendtext = $current_blog->spam ? esc_attr('Unsuspend blog') : esc_attr('Suspend blog'); + $suspendtext = $current_blog->spam ? esc_attr('Unsuspend site') : esc_attr('Suspend site'); $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog'; - $mature_url = admin_url( "ms-edit.php?action=confirm&action2={$matureaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) ); - $suspend_url = admin_url( "ms-edit.php?action=confirm&action2={$suspendaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) ); + $mature_url = network_admin_url( "edit.php?action=confirm&action2={$matureaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) ); + $suspend_url = network_admin_url( "edit.php?action=confirm&action2={$suspendaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) ); /* Add the submenu items to the Super Admin menu */ - $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Dashboard' ), 'href' => admin_url(), 'position' => 10 ) ); - $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Options' ), 'href' => admin_url( "ms-sites.php?action=blogs&searchaction=id&s={$current_blog->blog_id}" ), 'position' => 30 ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Dashboard' ), 'href' => admin_url(), 'position' => 10 ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Options' ), 'href' => network_admin_url( "sites.php?action=blogs&searchaction=id&s={$current_blog->blog_id}" ), 'position' => 30 ) ); $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$maturetext", 'href' => $mature_url, 'position' => 50 ) ); $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$suspendtext", 'href' => $suspend_url, 'position' => 80 ) ); } @@ -153,4 +153,4 @@ function wp_admin_bar_removemodcount( $stats ) { return (object) $stats; } -?> +?> \ No newline at end of file