From a0e830d9af296c2d5f081ad3a22a366168415525 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Wed, 22 Jul 2015 01:26:25 +0000
Subject: [PATCH] Nav Menus: Add a Menus title with Manage in Customizer button
 to nav-menus.php

This aligns the `<h1>` on `wp-admin/nav-menus.php` with that of other admin screens and aligns the "Manage in Customizer" button with that on `wp-admin/widgets.php`.

Fixes #32808.

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


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

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 4c0f7bfbf1..f70826f8ff 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -558,26 +558,29 @@ get_current_screen()->set_help_sidebar(
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-	<h1 class="nav-tab-wrapper">
+	<h1><?php echo esc_html( __( 'Menus' ) ); ?>
+		<?php
+		if ( current_user_can( 'customize' ) ) :
+			$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+			printf(
+				' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+				esc_url( add_query_arg( array(
+					array( 'autofocus' => $focus ),
+					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+				), admin_url( 'customize.php' ) ) ),
+				__( 'Manage in Customizer' )
+			);
+		endif;
+		?>
+	</h1>
+	<h2 class="nav-tab-wrapper">
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?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<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
 			endif;
-
-			if ( current_user_can( 'customize' ) ) :
-				$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
-				printf(
-					' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-					esc_url( add_query_arg( array(
-						array( 'autofocus' => $focus ),
-						'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-					), admin_url( 'customize.php' ) ) ),
-					__( 'Manage in Customizer' )
-				);
-			endif;
 		?>
-	</h1>
+	</h2>
 	<?php
 	foreach( $messages as $message ) :
 		echo $message . "\n";
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5174c1ea18..ae52b45cb6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta3-33354';
+$wp_version = '4.3-beta3-33355';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.