Ticket #43397: 43397.2.diff

src/wp-admin/css/common.css

@@ -174 +174 @@
 .widget-inside,
 #menu-settings-column .accordion-container,
 #menu-management .menu-edit,
-.manage-menus,
 table.widefat,
 .stuffbox,
 p.popular-tags,

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

@@ -83 +83 @@
         margin-top: 23px;
         padding: 10px;
         overflow: hidden;
-        background: #fbfbfb;
 }
 
 .manage-menus .selected-menu,

src/wp-admin/nav-menus.php

@@ -742 +742 @@
                 <span class="add-edit-menu-action">
                         <?php
                         printf(
-                                __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url(
+                                __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ), esc_url(
                                         add_query_arg(
                                                 array(
                                                         'action' => 'edit',
@@ -752 +752 @@
                                 )
                         );
 ?>
+                        <span class="screen-reader-text"><?php _e( 'Activate "Save menu" button to save your changes.' ); ?></span>
                 </span><!-- /add-edit-menu-action -->
                 <?php else : ?>
                         <form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
@@ -830 +831 @@
                         <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' ); ?>
+                        <h2><?php _e( 'Add menu items' ); ?></h2>
                         <?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
                 </form>
 
@@ -843 +845 @@
                                 $new_screen_class = 'blank-slate';
                         }
                         ?>
+                                <h2><?php _e( 'Menu structure' ); ?></h2>
                                 <div class="menu-edit <?php echo $new_screen_class; ?>">
                                         <input type="hidden" name="nav-menu-data">
                                         <?php
@@ -875 +878 @@
                                         <div id="post-body">
                                                 <div id="post-body-content" class="wp-clearfix">
                                                         <?php if ( ! $add_new_screen ) : ?>
-                                                        <h3><?php _e( 'Menu Structure' ); ?></h3>
                                                         <?php
                                                                 $hide_style = '';
                                                         if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {