From d422fd53317b5024390a47ec0f8faf25a3cf4c07 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Wed, 6 Mar 2013 19:34:01 +0000
Subject: [PATCH] Tweak the Nav Menu UX, especially around menu creation.

props lessbloat, DrewAPicture, jkudish. fixes #23641

git-svn-id: https://develop.svn.wordpress.org/trunk@23622 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin.css |  6 ++++++
 wp-admin/nav-menus.php    | 23 +++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index 5caea44cb2..ab61e5d2a2 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -7382,6 +7382,12 @@ a.rsswidget {
 	padding: 0px;
 }
 
+.nav-menus-php .add-new-menu-action {
+	float: left;
+	margin: 6px 0 0 6px;
+	line-height: 15px;
+}
+
 .nav-menus-php .meta-sep,
 .nav-menus-php .submitdelete,
 .nav-menus-php .submitcancel {
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index f9df9c3f05..d733552327 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -453,17 +453,21 @@ require_once( './admin-header.php' );
 ?>
 <div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php _e( 'Menus' ); ?> <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, ), admin_url( 'nav-menus.php' ) ) ); ?>" class="add-new-h2"><?php _e( 'Add New' ); ?></a></h2>
+	<h2><?php _e( 'Menus' ); ?></h2>
 	<?php
 	foreach( $messages as $message ) :
 		echo $message . "\n";
 	endforeach;
 	?>
-	<?php if ( 1 < $menu_count ) : ?>
-	<form method="post" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
-		<input type="hidden" name="action" value="edit" />
-		<div class="manage-menus">
-			<label for="menu" class="selected-menu"><?php _e('Select menu to edit'); ?></label>
+	<div class="manage-menus">
+	<?php if ( $menu_count < 2 ) : ?>
+		<span class="add-edit-menu-action">
+			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+		</span><!-- /add-edit-menu-action -->
+	<?php else : ?>
+		<form method="post" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+			<input type="hidden" name="action" value="edit" />
+			<label for="menu" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
 			<select name="menu" id="menu">
 				<?php if ( $add_new_screen ) : ?>
 					<option value="0" selected="selected"><?php _e( '-- Select --' ); ?></option>
@@ -491,9 +495,12 @@ require_once( './admin-header.php' );
 				<?php endforeach; ?>
 			</select>
 			<span class="submit-btn"><input type="submit" class="button-secondary" value="<?php _e( 'Select' ); ?>"></span>
-		</div>
-	</form>
+			<span class="add-new-menu-action">
+				<?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			</span><!-- /add-new-menu-action -->
+		</form>
 	<?php endif; ?>
+	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame">
 	<div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">