Changeset 48051

Timestamp:

06/15/2020 11:20:18 PM (4 years ago)

Author:

whyisjake

Message:

Menus: Provide menu settings when creating a new menu.

This simplifies the steps in the process of adding new menus.

Props: garrett-eclipse, audrasjb, ianjvr.

Location:

trunk/src/wp-admin

Files:

• css/nav-menus.css (modified) (2 diffs)
• nav-menus.php (modified) (5 diffs)

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

@@ -64 +64 @@
 #wpbody {
     position: relative;
-}
-
-.blank-slate .menu-settings {
-    border: none;
-    margin-top: 0;
-    padding-top: 0;
-    overflow: hidden;
 }
 
@@ -750 +743 @@
 }
 
-.nav-menus-php .blank-slate .menu-settings {
-    display: none;
-}
-
 /* Same as the Publish Meta Box #delete-action */
 .nav-menus-php .delete-action {

trunk/src/wp-admin/nav-menus.php

@@ -301 +301 @@
         check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
 
-        // Remove menu locations that have been unchecked.
-        foreach ( $locations as $location => $description ) {
-            if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
-                unset( $menu_locations[ $location ] );
-            }
-        }
-
         // Merge new and existing menu locations if any new ones are set.
         if ( isset( $_POST['menu-locations'] ) ) {
@@ -313 +306 @@
             $menu_locations     = array_merge( $menu_locations, $new_menu_locations );
         }
-
-        // Set menu locations.
-        set_theme_mod( 'nav_menu_locations', $menu_locations );
 
         // Add Menu.
@@ -333 +323 @@
                         wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
                     }
-                    if ( isset( $_REQUEST['zero-menu-state'] ) ) {
+                    // Set the menu_location value correctly for the newly created menu.
+                    foreach ( $menu_locations as $location => $id ) {
+                        if ( 0 === $id ) {
+                            $menu_locations[ $location ] = $nav_menu_selected_id;
+                        }
+                    }
+                    set_theme_mod( 'nav_menu_locations', $menu_locations );
+                    if ( isset( $_REQUEST['zero-menu-state'] ) || ! empty( $_POST['auto-add-pages'] ) ) {
                         // If there are menu items, add them.
                         wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
+                    }
+                    if ( isset( $_REQUEST['zero-menu-state'] ) ) {
                         // Auto-save nav_menu_locations.
                         $locations = get_nav_menu_locations();
@@ -360 +359 @@
             }
 
-            // Update existing menu.
+        // Update existing menu.
         } else {
+            // Remove menu locations that have been unchecked.
+            foreach ( $locations as $location => $description ) {
+                if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
+                    unset( $menu_locations[ $location ] );
+                }
+            }
+
+            // Set menu locations.
+            set_theme_mod( 'nav_menu_locations', $menu_locations );
 
             $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
@@ -894 +902 @@
         <div id="menu-management">
             <form id="update-nav-menu" method="post" enctype="multipart/form-data">
-            <?php
-            $new_screen_class = '';
-            if ( $add_new_screen ) {
-                $new_screen_class = 'blank-slate';
-            }
-            ?>
                 <h2><?php _e( 'Menu structure' ); ?></h2>
-                <div class="menu-edit <?php echo $new_screen_class; ?>">
+                <div class="menu-edit">
                     <input type="hidden" name="nav-menu-data">
                     <?php