Ticket #40678: 40678.3.diff

src/wp-admin/css/nav-menus.css

@@ -65 +65 @@
         position: relative;
 }
 
+ul.nav-tab-wrapper > li {
+        margin-bottom: 0;
+}
+
 .blank-slate .menu-settings {
         border: none;
         margin-top: 0;

src/wp-admin/includes/nav-menu.php

@@ -300 +300 @@
 
                 <p class="button-controls wp-clearfix">
                         <span class="add-to-menu">
-                                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+                                <button type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" name="add-custom-menu-item" id="submit-customlinkdiv">
+                                        <?php esc_attr_e( 'Add to Menu' ); ?><span class="screen-reader-text"> <?php esc_attr_e( 'You will have to activate "save menu" button to save your changes' ); ?></span>
+                                </button>
                                 <span class="spinner"></span>
                         </span>
                 </p>
@@ -631 +633 @@
                         </span>
 
                         <span class="add-to-menu">
-                                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+                                <button type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>">
+                                        <?php esc_attr_e( 'Add to Menu' ); ?><span class="screen-reader-text"> <?php esc_attr_e( 'You will have to activate "save menu" button to save your changes' ); ?></span>
+                                </button>
                                 <span class="spinner"></span>
                         </span>
                 </p>
@@ -876 +880 @@
                         </span>
 
                         <span class="add-to-menu">
-                                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+                                <button type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>">
+                                        <?php esc_attr_e( 'Add to Menu' ); ?><span class="screen-reader-text"> <?php esc_attr_e( 'You will have to activate "save menu" button to save your changes' ); ?></span>
+                                </button>
                                 <span class="spinner"></span>
                         </span>
                 </p>

src/wp-admin/nav-menus.php

@@ -626 +626 @@
 
         <hr class="wp-header-end">
 
-        <h2 class="nav-tab-wrapper wp-clearfix">
-                <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>
+        <ul class="nav-tab-wrapper wp-clearfix">
+                <li><a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>" aria-label="<?php esc_html_e( 'Main tab to edit menus' ); ?>"><?php esc_html_e( 'Edit Menus' ); ?></a></li>
                 <?php if ( $num_locations && $menu_count ) : ?>
-                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
+                        <li><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
                                                                 <?php
                                                                 if ( $locations_screen ) {
                                                                         echo ' nav-tab-active';}
 ?>
-"><?php esc_html_e( 'Manage Locations' ); ?></a>
+" aria-label="<?php esc_html_e( 'Main tab to edit menus locations' ); ?>"><?php esc_html_e( 'Manage Locations' ); ?></a></li>
                 <?php
                         endif;
                 ?>
-        </h2>
+        </ul>
         <?php
         foreach ( $messages as $message ) :
                 echo $message . "\n";
@@ -830 +830 @@
                         <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                         <input type="hidden" name="action" value="add-menu-item" />
                         <?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
+                        <span class="screen-reader-text"><?php _e( 'Select the items you want to display in your menu.' ); ?></span>
                         <?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
                 </form>
 
@@ -843 +844 @@
                                 $new_screen_class = 'blank-slate';
                         }
                         ?>
+                                <span class="screen-reader-text"><?php _e( 'Menu settings: menu location, display order of its items, labels, moving or deleting items, etc.' ); ?></span>
                                 <div class="menu-edit <?php echo $new_screen_class; ?>">
                                         <input type="hidden" name="nav-menu-data">
                                         <?php