Ticket #14772: adminbarfixes.diff
File adminbarfixes.diff, 8.9 KB (added by , 13 years ago) |
---|
-
admin-bar.php
102 102 add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 ); 103 103 104 104 /** 105 * Use the $wp_admin_bar global to add the "My Blogs/[BlogName]" menu and all submenus.105 * Use the $wp_admin_bar global to add the "My Sites/[Site Name]" menu and all submenus. 106 106 */ 107 107 function wp_admin_bar_my_blogs_menu() { 108 108 global $wpdb, $wp_admin_bar; … … 118 118 } 119 119 } 120 120 121 /* Add the 'My Dashboards' menu if the user has more than one blog. */121 /* Add the 'My Dashboards' menu if the user has more than one site. */ 122 122 if ( count( $wp_admin_bar->user->blogs ) > 1 ) { 123 $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) );123 $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain ) ); 124 124 125 125 $default = includes_url('images/wpmini-blue.png'); 126 126 … … 145 145 $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/' ) ); 146 146 $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' ) ); 147 147 // @todo, stats plugins should add this: 148 //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( ' BlogStats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) );148 //$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' ) ); 149 149 $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' ) ); 150 $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Blog' ), 'href' => constant( 'PROTO' ) . $blogdomain ) );150 $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Site' ), 'href' => constant( 'PROTO' ) . $blogdomain ) ); 151 151 } 152 152 $counter++; 153 153 } 154 154 155 /* Add the "Manage Blogs" menu item */156 // @todo, use dashboard blog.157 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Blogs' ), admin_url('my-sites.php') ) );155 /* Add the "Manage Sites" menu item */ 156 // @todo, use dashboard site. 157 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Sites' ), admin_url('my-sites.php') ) ); 158 158 159 /* Add the 'My Dashboard' menu if the user only has one blog. */159 /* Add the 'My Dashboard' menu if the user only has one site. */ 160 160 } else { 161 161 $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blog' ), 'href' => $wp_admin_bar->user->account_domain ) ); 162 162 … … 165 165 // @todo Stats plugins should add this. 166 166 //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Blog Stats' ), 'href' => admin_ur;('index.php?page=stats') ) ); 167 167 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-c', 'title' => __( 'Manage Comments' ), 'href' => admin_url('edit-comments.php') ) ); 168 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Blog' ), 'href' => home_url() ) );168 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Site' ), 'href' => home_url() ) ); 169 169 } 170 170 } 171 171 add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 ); … … 181 181 182 182 $default = includes_url('images/wpmini-blue.png'); 183 183 184 $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current blogavatar' ) . '" width="16" height="16" />', 'href' => home_url() ) );184 $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current site avatar' ) . '" width="16" height="16" />', 'href' => home_url() ) ); 185 185 } 186 186 add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 ); 187 187 188 188 /** 189 * Use the $wp_admin_bar global to add a menu for bloginfo, accessable to all users.189 * Use the $wp_admin_bar global to add a menu for site info, accessable to all users. 190 190 */ 191 191 function wp_admin_bar_bloginfo_menu() { 192 192 global $wp_admin_bar; … … 195 195 return false; 196 196 197 197 /* Add the Blog Info menu */ 198 $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( ' BlogInfo' ), 'href' => '' ) );198 $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '' ) ); 199 199 200 200 $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'); } return false; } wpcomshort();' ) ) ); 201 201 } … … 343 343 } 344 344 add_filter('locale', 'wp_admin_bar_lang'); 345 345 346 ?> 346 ?> 347 No newline at end of file -
admin-bar/admin-bar-superadmin.php
29 29 30 30 wp_admin_bar_build_snackmenu(); 31 31 32 /* Get the settings we need for the current blog*/32 /* Get the settings we need for the current site */ 33 33 $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog'; 34 34 $maturetext = $current_blog->mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature'); 35 $suspendtext = $current_blog->spam ? esc_attr('Unsuspend blog') : esc_attr('Suspend blog');35 $suspendtext = $current_blog->spam ? esc_attr('Unsuspend site') : esc_attr('Suspend site'); 36 36 $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog'; 37 $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?" ) );38 $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} ?" ) );37 $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?" ) ); 38 $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} ?" ) ); 39 39 40 40 /* Add the submenu items to the Super Admin menu */ 41 $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( ' Blog Dashboard' ), 'href' =>admin_url(), 'position' => 10 ) );42 $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 ) );41 $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Dashboard' ), 'href' => network_admin_url(), 'position' => 10 ) ); 42 $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 ) ); 43 43 $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$maturetext", 'href' => $mature_url, 'position' => 50 ) ); 44 44 $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$suspendtext", 'href' => $suspend_url, 'position' => 80 ) ); 45 45 } … … 153 153 return (object) $stats; 154 154 } 155 155 156 ?> 156 ?> 157 No newline at end of file