Ticket #23641: 23641.3.diff

wp-admin/nav-menus.php

@@ -455 +455 @@
 ?>
 <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
+        $add_menu_link_text = esc_html__( 'add a new menu' );
+        if ( $menu_count <= 1 ) :
+                if ( $menu_count == 0 )
+                        $add_menu_link_text = esc_html__( 'create a blank new menu' );
+                ?>
+                <span class="add-edit-menu-action">
+                        <?php _e( 'Edit your menu below, or' ); ?> <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ); ?>"><?php echo $add_menu_link_text; ?></a>.
+                </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>
@@ -493 +502 @@
                                 <?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="%1$s">%2$s</a>', esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ), $add_menu_link_text ); ?>.
+                        </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'; } ?>">
 

wp-admin/css/wp-admin.css

@@ -7308 +7308 @@
         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 {