Changeset 47770

Timestamp:

05/06/2020 07:33:45 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Menus: Add a Cancel link to the screen for creating a new menu.

The use case this helps the most is when there's only one menu and you click "create a new menu". In this case the Cancel link allows you to go back to the single existing menu.

Props garrett-eclipse, audrasjb.
Fixes #46367.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (6 diffs)

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

@@ -888 +888 @@
                         <form id="update-nav-menu" method="post" enctype="multipart/form-data">
                         <?php
-                                $new_screen_class = '';
+                        $new_screen_class = '';
                         if ( $add_new_screen ) {
                                 $new_screen_class = 'blank-slate';
@@ -926 +926 @@
                                                 <div id="post-body-content" class="wp-clearfix">
                                                         <?php if ( ! $add_new_screen ) : ?>
+
                                                                 <?php
                                                                 $hide_style = '';
@@ -938 +939 @@
                                                                 }
                                                                 ?>
-                                                        <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
-                                                                <p><?php echo $starter_copy; ?></p>
-                                                        </div>
+                                                                <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
+                                                                        <p><?php echo $starter_copy; ?></p>
+                                                                </div>
+
                                                                 <?php
                                                                 if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
@@ -946 +948 @@
                                                                 } else {
                                                                         ?>
-                                                        <ul class="menu" id="menu-to-edit"></ul>
+                                                                        <ul class="menu" id="menu-to-edit"></ul>
                                                                 <?php } ?>
+
                                                         <?php endif; ?>
+
                                                         <?php if ( $add_new_screen ) : ?>
                                                                 <p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
@@ -954 +958 @@
                                                                         <input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
                                                                 <?php endif; ?>
+
                                                                 <?php
-                                                                endif;
-
-                                                                $no_menus_style = '';
+                                                        endif;
+
+                                                        $no_menus_style = '';
                                                         if ( $one_theme_location_no_menus ) {
                                                                 $no_menus_style = 'style="display: none;"';
@@ -1015 +1020 @@
                                         <div id="nav-menu-footer">
                                                 <div class="major-publishing-actions wp-clearfix">
-                                                        <?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
-                                                        <span class="delete-action">
-                                                                <a class="submitdelete deletion menu-delete" href="
-                                                                <?php
-                                                                echo esc_url(
-                                                                        wp_nonce_url(
-                                                                                add_query_arg(
-                                                                                        array(
-                                                                                                'action' => 'delete',
-                                                                                                'menu'   => $nav_menu_selected_id,
+                                                        <?php if ( $menu_count > 0 ) : ?>
+
+                                                                <?php if ( $add_new_screen ) : ?>
+                                                                <span class="cancel-action">
+                                                                        <a class="submitcancel cancellation menu-cancel" href="<?php echo esc_url( admin_url( 'nav-menus.php' ) ); ?>"><?php _e( 'Cancel' ); ?></a>
+                                                                </span><!-- END .cancel-action -->
+                                                                <?php else : ?>
+                                                                <span class="delete-action">
+                                                                        <a class="submitdelete deletion menu-delete" href="
+                                                                        <?php
+                                                                        echo esc_url(
+                                                                                wp_nonce_url(
+                                                                                        add_query_arg(
+                                                                                                array(
+                                                                                                        'action' => 'delete',
+                                                                                                        'menu' => $nav_menu_selected_id,
+                                                                                                ),
+                                                                                                admin_url( 'nav-menus.php' )
                                                                                         ),
-                                                                                        admin_url( 'nav-menus.php' )
-                                                                                ),
-                                                                                'delete-nav_menu-' . $nav_menu_selected_id
-                                                                        )
-                                                                );
-                                                                ?>
-                                                                "><?php _e( 'Delete Menu' ); ?></a>
-                                                        </span><!-- END .delete-action -->
+                                                                                        'delete-nav_menu-' . $nav_menu_selected_id
+                                                                                )
+                                                                        );
+                                                                        ?>
+                                                                        "><?php _e( 'Delete Menu' ); ?></a>
+                                                                </span><!-- END .delete-action -->
+                                                                <?php endif; ?>
+
                                                         <?php endif; ?>
                                                         <div class="publishing-action">