Changeset 38660

Timestamp:

09/27/2016 07:00:35 PM (9 years ago)

Author:

ocean90

Message:

Toolbar: Update links to the about page if current user can't access the dashboard of the current site.

Add missing focus styling for menu items with an icon.

Fixes #37949.

Location:

trunk

Files:

• src/wp-admin/css/colors/_admin.scss (modified) (1 diff)
• src/wp-includes/admin-bar.php (modified) (3 diffs)
• src/wp-includes/css/admin-bar.css (modified) (1 diff)
• tests/phpunit/tests/adminbar.php (modified) (1 diff)

trunk/src/wp-admin/css/colors/_admin.scss

@@ -325 +325 @@
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
+#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,

trunk/src/wp-includes/admin-bar.php

@@ -108 +108 @@
  */
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
-    $wp_admin_bar->add_menu( array(
+    if ( current_user_can( 'read' ) ) {
+        $about_url = self_admin_url( 'about.php' );
+    } elseif ( is_multisite() ) {
+        $about_url = get_dashboard_url( get_current_user_id(), 'about.php' );
+    } else {
+        $about_url = false;
+    }
+
+    $wp_logo_menu_args = array(
         'id'    => 'wp-logo',
         'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
-        'href'  => self_admin_url( 'about.php' ),
-    ) );
-
-    if ( is_user_logged_in() ) {
+        'href'  => $about_url,
+    );
+
+    // Set tabindex="0" to make sub menus accessible when no URL is available.
+    if ( ! $about_url ) {
+        $wp_logo_menu_args['meta'] = array(
+            'tabindex' => 0,
+        );
+    }
+
+    $wp_admin_bar->add_menu( $wp_logo_menu_args );
+
+    if ( $about_url ) {
         // Add "About WordPress" link
         $wp_admin_bar->add_menu( array(
@@ -120 +137 @@
             'id'     => 'about',
             'title'  => __('About WordPress'),
-            'href'   => self_admin_url( 'about.php' ),
+            'href'   => $about_url,
         ) );
     }
@@ -295 +312 @@
 
     if ( is_network_admin() ) {
-        /* translators: %s: site name */ 
+        /* translators: %s: site name */
         $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
     } elseif ( is_user_admin() ) {
-        /* translators: %s: site name */ 
+        /* translators: %s: site name */
         $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
     }

trunk/src/wp-includes/css/admin-bar.css

@@ -295 +295 @@
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
+#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,

trunk/tests/phpunit/tests/adminbar.php

@@ -408 +408 @@
         $this->assertNull( $node );
     }
+
+    /**
+     * @ticket 37949
+     */
+    public function test_admin_bar_does_not_add_about_page_url() {
+        wp_set_current_user( self::$no_role_id );
+
+        $wp_admin_bar = $this->get_standard_admin_bar();
+        $node         = $wp_admin_bar->get_node( 'wp-logo' );
+
+        $this->assertNotNull( $node );
+        $this->assertSame( false, $node->href );
+        $this->assertArrayHasKey( 'tabindex', $node->meta );
+        $this->assertSame( 0, $node->meta['tabindex'] );
+
+        wp_set_current_user( self::$editor_id );
+
+        $wp_admin_bar = $this->get_standard_admin_bar();
+        $node         = $wp_admin_bar->get_node( 'wp-logo' );
+
+        $this->assertNotNull( $node );
+        $this->assertSame( admin_url( 'about.php' ), $node->href );
+        $this->assertArrayNotHasKey( 'tabindex', $node->meta );
+    }
 }