<!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>[48051] trunk/src/wp-admin: Menus: Provide menu settings when 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/48051">48051</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/48051","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-15 23:20:18 +0000 (Mon, 15 Jun 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: Provide menu settings when creating a new menu.
This simplifies the steps in the process of adding new menus.
Props: garrett-eclipse, audrasjb, ianjvr. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssnavmenuscss">trunk/src/wp-admin/css/nav-menus.css</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssnavmenuscss"></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/css/nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/nav-menus.css 2020-06-15 23:04:27 UTC (rev 48050)
+++ trunk/src/wp-admin/css/nav-menus.css 2020-06-15 23:20:18 UTC (rev 48051)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,13 +65,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</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">-.blank-slate .menu-settings {
- border: none;
- margin-top: 0;
- padding-top: 0;
- overflow: hidden;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .is-submenu {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #555d66; /* #fafafa background */
</span><span class="cx" style="display: block; padding: 0 10px"> font-style: italic;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,10 +742,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</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">-.nav-menus-php .blank-slate .menu-settings {
- display: none;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Same as the Publish Meta Box #delete-action */
</span><span class="cx" style="display: block; padding: 0 10px"> .nav-menus-php .delete-action {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span></span></pre></div>
<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-06-15 23:04:27 UTC (rev 48050)
+++ trunk/src/wp-admin/nav-menus.php 2020-06-15 23:20:18 UTC (rev 48051)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,13 +300,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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 ] );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Merge new and existing menu locations if any new ones are set.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['menu-locations'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,9 +306,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_locations = array_merge( $menu_locations, $new_menu_locations );
</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">- // Set menu locations.
- set_theme_mod( 'nav_menu_locations', $menu_locations );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add Menu.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $nav_menu_selected_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,9 +322,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['menu-item'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['zero-menu-state'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If there are menu items, add them.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( isset( $_REQUEST['zero-menu-state'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Auto-save nav_menu_locations.
</span><span class="cx" style="display: block; padding: 0 10px"> $locations = get_nav_menu_locations();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locations as $location => $menu_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,9 +358,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
</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">- // Update existing menu.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update existing menu.
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 ] );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set menu locations.
+ set_theme_mod( 'nav_menu_locations', $menu_locations );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_title = trim( esc_html( $_POST['menu-name'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,14 +901,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-management-liquid">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $new_screen_class = '';
- if ( $add_new_screen ) {
- $new_screen_class = 'blank-slate';
- }
- ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Menu structure' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="menu-edit <?php echo $new_screen_class; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="menu-edit">
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="nav-menu-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span></span></pre>
</div>
</div>
</body>
</html>