Ticket #29906: 29906-8-comment15.diff
File 29906-8-comment15.diff, 5.3 KB (added by , 6 years ago) |
---|
-
wp-includes/admin-bar.php
187 187 'id' => 'my-account', 188 188 'parent' => 'top-secondary', 189 189 'title' => $howdy . $avatar, 190 'href' => $profile_url,190 'href' => wp_is_mobile() ? '#' : $profile_url, 191 191 'meta' => array( 192 192 'class' => $class, 193 193 ), … … 273 273 274 274 $title = wp_html_excerpt( $blogname, 40, '…' ); 275 275 276 $ wp_admin_bar->add_menu(array(276 $site_menu = array( 277 277 'id' => 'site-name', 278 278 'title' => $title, 279 'href' => is_admin() ? home_url( '/' ) : admin_url(), 280 ) ); 279 ); 281 280 281 if ( ! wp_is_mobile() ) { 282 $site_menu['href'] = is_admin() ? home_url( '/' ) : admin_url(); 283 } 282 284 // Create submenu items. 285 $wp_admin_bar->add_menu( $site_menu ); 283 286 287 284 288 if ( is_admin() ) { 285 // Add an option to visit the site.286 $wp_admin_bar->add_menu( array(287 'parent' => 'site-name',288 'id' => 'view-site',289 'title' => __( 'Visit Site' ),290 'href' => home_url( '/' ),291 ) );292 289 293 if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {290 if ( ( is_network_admin() || is_blog_admin() ) && is_multisite() && current_user_can( 'manage_sites' ) ) { 294 291 $wp_admin_bar->add_menu( array( 295 292 'parent' => 'site-name', 296 293 'id' => 'edit-site', 297 294 'title' => __( 'Edit Site' ), 298 295 'href' => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ), 299 296 ) ); 297 $wp_admin_bar->add_menu( array( 298 'parent' => 'site-name', 299 'id' => 'visit-site', 300 'title' => __( 'Visit Site' ), 301 'href' => home_url(), 302 ) ); 303 } else { 304 $wp_admin_bar->add_menu( array( 305 'parent' => 'site-name', 306 'id' => 'visit-site', 307 'title' => __( 'Visit Site' ), 308 'href' => home_url(), 309 ) ); 300 310 } 301 311 302 312 } else { … … 356 366 ) ); 357 367 $wp_admin_bar->add_menu( array( 358 368 'parent' => 'network-admin', 369 'id' => 'network-admin-m', 370 'title' => __( 'My Sites' ), 371 'href' => get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' ), 372 ) ); 373 $wp_admin_bar->add_menu( array( 374 'parent' => 'network-admin', 359 375 'id' => 'network-admin-s', 360 376 'title' => __( 'Sites' ), 361 377 'href' => network_admin_url( 'sites.php' ), … … 596 612 597 613 $title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>'; 598 614 599 $ wp_admin_bar->add_menu(array(615 $site_menu = array( 600 616 'id' => 'new-content', 601 617 'title' => $title, 602 'href' => admin_url( current( array_keys( $actions ) ) ), 603 ) ); 618 ); 604 619 620 if ( ! wp_is_mobile() ) { 621 $site_menu['href'] = admin_url( current( array_keys( $actions ) ) ); 622 } 623 // Create submenu items. 624 $wp_admin_bar->add_menu( $site_menu ); 625 605 626 foreach ( $actions as $link => $action ) { 606 627 list( $title, $id ) = $action; 607 628 -
wp-includes/css/admin-bar.css
207 207 right: 100%; 208 208 } 209 209 210 #wpadminbar .ab-top-menu > li > .ab-item:focus,211 210 #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, 212 #wpadminbar .ab-top-menu > li:hover > .ab-item,213 211 #wpadminbar .ab-top-menu > li.hover > .ab-item { 214 212 background: #32373c; 215 213 color: #45bbe6; 216 214 } 217 215 218 #wpadminbar > #wp-toolbar li:hover span.ab-label,219 216 #wpadminbar > #wp-toolbar li.hover span.ab-label, 220 217 #wpadminbar > #wp-toolbar a:focus span.ab-label { 221 218 color: #45bbe6; … … 244 241 245 242 #wpadminbar .ab-icon:before, 246 243 #wpadminbar .ab-item:before, 244 #wpadminbar .ab-item, 247 245 #wpadminbar #adminbarsearch:before { 248 246 position: relative; 249 247 -webkit-transition: all .1s ease-in-out; … … 276 274 #wpadminbar .quicklinks .menupop.hover ul li a:focus, 277 275 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, 278 276 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, 279 #wpadminbar li:hover .ab-icon:before,280 #wpadminbar li:hover .ab-item:before,281 277 #wpadminbar li a:focus .ab-icon:before, 282 278 #wpadminbar li .ab-item:focus:before, 283 279 #wpadminbar li.hover .ab-icon:before, -
wp-includes/js/admin-bar.js
28 28 e.stopPropagation(); 29 29 e.preventDefault(); 30 30 el.addClass('hover'); 31 } else if ( el.children('.ab-empty-item') ) { 32 if ( el.hasClass('hover') ) { 33 adminbar.find('li.menupop.hover').removeClass('hover'); 34 } 31 35 } 32 36 $('#wpadminbar').click( function(e) { 37 if ( e.target.id != 'wpadminbar' ) { 38 } else { 39 adminbar.find('li.menupop.hover').removeClass('hover'); 40 } 41 }); 33 42 if ( unbind ) { 34 43 $('li.menupop').off('click.wp-mobile-hover'); 35 44 disableHoverIntent = false; … … 123 132 target.siblings('.ab-sub-wrapper').find('.ab-item').each(refresh); 124 133 }); 125 134 126 $('#wpadminbar').click( function(e) {127 if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' )128 return;129 130 e.preventDefault();131 $('html, body').animate({ scrollTop: 0 }, 'fast');132 });133 134 135 // fix focus bug in WebKit 135 136 $('.screen-reader-shortcut').keydown( function(e) { 136 137 var id, ua;