From d0e1b541056916f6e5daa19d0ae090f35240c9ba Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Tue, 20 Mar 2018 17:48:21 +0000
Subject: [PATCH] Accessibility: Menus screen: Improve headings and
 instructions for better accessibility.

Props audrasjb, melchoyce, juliemoynat.
Fixes #43397.

Built from https://develop.svn.wordpress.org/trunk@42857


git-svn-id: http://core.svn.wordpress.org/trunk@42687 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/nav-menus.php  | 9 ++++++---
 wp-includes/version.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index dafcda90cd..cd4454a17b 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -742,7 +742,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		<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&#8217;t forget to save your changes!' ), esc_url(
 					add_query_arg(
 						array(
 							'action' => 'edit',
@@ -752,6 +752,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				)
 			);
 ?>
+			<span class="screen-reader-text"><?php _e( 'Click the 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' ); ?>">
@@ -800,7 +801,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			<span class="add-new-menu-action">
 				<?php
 				printf(
-					__( 'or <a href="%s">create a new menu</a>.' ), esc_url(
+					__( 'or <a href="%s">create a new menu</a>. Don&#8217;t forget to save your changes!' ), esc_url(
 						add_query_arg(
 							array(
 								'action' => 'edit',
@@ -810,6 +811,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 					)
 				);
 ?>
+				<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
 			</span><!-- /add-new-menu-action -->
 		</form>
 	<?php
@@ -830,6 +832,7 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 			<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,6 +846,7 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 				$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,7 +879,6 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 					<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 ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f144d87006..68e3dad7eb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42856';
+$wp_version = '5.0-alpha-42857';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.