Ticket #46367: 46367.5.diff

src/wp-admin/css/common.css

@@ -889 +889 @@
 #media-items a.delete,
 #media-items a.delete-permanently,
 #nav-menu-footer .menu-delete,
+#nav-menu-footer .menu-cancel,
 #delete-link a.delete {
         color: #a00;
 }
@@ -906 +907 @@
 #media-items a.delete:hover,
 #media-items a.delete-permanently:hover,
 #nav-menu-footer .menu-delete:hover,
+#nav-menu-footer .menu-cancel:hover,
 #delete-link a.delete:hover {
         color: #dc3232;
         border: none;

src/wp-admin/nav-menus.php

@@ -1003 +1003 @@
                                         </div><!-- /#post-body -->
                                         <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 ( 0 !== $menu_count ) : ?>
+                                                                <?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">
                                                                 <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>