Changeset 45300 for trunk/src/wp-admin/nav-menus.php

Timestamp:

05/09/2019 08:57:06 PM (6 years ago)

Author:

afercia

Message:

Accessibility: Add aria-current to the links in the <nav> elements introduced in [44905].

Also fixes a few translators comments and coding standards.

Props audrasjb.
Fixes #47106.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (4 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -621 +621 @@
 
     $nav_tab_active_class = '';
+    $nav_aria_current     = '';
     if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
         $nav_tab_active_class = ' nav-tab-active';
+        $nav_aria_current     = ' aria-current="page"';
     }
     ?>
@@ -629 +631 @@
 
     <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-        <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+        <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"<?php echo $nav_aria_current; ?>><?php esc_html_e( 'Edit Menus' ); ?></a>
         <?php
         if ( $num_locations && $menu_count ) {
             $active_tab_class = '';
+            $aria_current     = '';
             if ( $locations_screen ) {
                 $active_tab_class = ' nav-tab-active';
+                $aria_current     = ' aria-current="page"';
             }
             ?>
-            <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+            <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"<?php echo $aria_current; ?>><?php esc_html_e( 'Manage Locations' ); ?></a>
             <?php
         }
@@ -879 +883 @@
                     }
                     ?>
-                     <input type="hidden" name="action" value="update" />
+                    <input type="hidden" name="action" value="update" />
                     <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                     <div id="nav-menu-header">
@@ -957 +961 @@
                                                 <span class="theme-location-set">
                                                 <?php
-                                                    /* translators: %s: menu name */
                                                     printf(
+                                                        /* translators: %s: menu name */
                                                         _x( '(Currently set to: %s)', 'menu location' ),
                                                         wp_get_nav_menu_object( $menu_locations[ $location ] )->name