<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47770] trunk/src/wp-admin/nav-menus.php: Menus: Add a Cancel link to the screen for creating a new menu.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47770">47770</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47770","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-06 19:33:45 +0000 (Wed, 06 May 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/46367">#46367</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2020-05-06 16:25:09 UTC (rev 47769)
+++ trunk/src/wp-admin/nav-menus.php 2020-05-06 19:33:45 UTC (rev 47770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,7 +887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-management">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="update-nav-menu" method="post" enctype="multipart/form-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_screen_class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_screen_class = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $add_new_screen ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_screen_class = 'blank-slate';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,6 +925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body-content" class="wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $add_new_screen ) : ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $hide_style = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,26 +938,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $starter_copy = __( 'Drag the items into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
- <p><?php echo $starter_copy; ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
+ <p><?php echo $starter_copy; ?></p>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $edit_markup;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul class="menu" id="menu-to-edit"></ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="menu" id="menu-to-edit"></ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $add_new_screen ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['use-location'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $no_menus_style = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $no_menus_style = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $one_theme_location_no_menus ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $no_menus_style = 'style="display: none;"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,25 +1019,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /#post-body -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menu-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="major-publishing-actions wp-clearfix">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?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,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- admin_url( 'nav-menus.php' )
- ),
- 'delete-nav_menu-' . $nav_menu_selected_id
- )
- );
- ?>
- "><?php _e( 'Delete Menu' ); ?></a>
- </span><!-- END .delete-action -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'delete-nav_menu-' . $nav_menu_selected_id
+ )
+ );
+ ?>
+ "><?php _e( 'Delete Menu' ); ?></a>
+ </span><!-- END .delete-action -->
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="publishing-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>