<!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>[41832] trunk/src: Customize: Vary description for nav menu locations control based on whether it is shown during menu creation.</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 { 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/41832">41832</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/41832","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-11 19:37:10 +0000 (Wed, 11 Oct 2017)</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'>Customize: Vary description for nav menu locations control based on whether it is shown during menu creation.
Also fix issue with initial visibility of notice when there are no menus.
Amends <a href="https://core.trac.wordpress.org/changeset/41823">[41823]</a>.
Props bpayton, melchoyce, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/42116">#42116</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42113">#42113</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincsscustomizenavmenuscss">trunk/src/wp-admin/css/customize-nav-menus.css</a></li>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenulocationscontrolphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></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/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2017-10-11 19:13:09 UTC (rev 41831)
+++ trunk/src/wp-admin/css/customize-controls.css 2017-10-11 19:37:10 UTC (rev 41832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,10 +677,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-section-description-container,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.control-section-nav_menu .customize-section-description-container {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.control-section-nav_menu .customize-section-description-container,
+.control-section-new_menu .customize-section-description-container {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 15px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.control-section-nav_menu .customize-control,
+.control-section-new_menu .customize-control {
+ /* Override default `margin-bottom` for `.customize-control` */
+ margin-bottom: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-section-title {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: -12px -12px 0 -12px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid #ddd;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2909,4 +2916,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .reordering .reorder-done {
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunksrcwpadmincsscustomizenavmenuscss"></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/customize-nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-nav-menus.css 2017-10-11 19:13:09 UTC (rev 41831)
+++ trunk/src/wp-admin/css/customize-nav-menus.css 2017-10-11 19:37:10 UTC (rev 41832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-theme-controls #accordion-section-menu_locations {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-top: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: 30px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-theme-controls #accordion-section-menu_locations > .accordion-section-title {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +52,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> min-width: 85px;
</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">-#customize-new-menu-submit-description {
- margin: 0;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .wp-customizer .menu-item-bar .menu-item-handle,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-customizer .menu-item-settings,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-customizer .menu-item-settings .description-thin {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,6 +208,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-customizer .control-section-nav_menu .menu-location-settings {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #ddd;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+
+.wp-customizer .control-section-nav_menu .menu-location-settings,
+.customize-control-nav_menu_auto_add {
</ins><span class="cx" style="display: block; padding: 0 10px"> padding-top: 12px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,6 +219,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: top;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.menu-location-settings .new-menu-locations-widget-note {
+ display: block;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-menu {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 4px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizenavmenusjs"></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/js/customize-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-nav-menus.js 2017-10-11 19:13:09 UTC (rev 41831)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2017-10-11 19:37:10 UTC (rev 41832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,16 +812,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> panel.saveManageColumnsState();
</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">- // Wait until after construction to patch the UI
- _.defer( function () {
-
- panel.contentContainer.find( '#accordion-section-menu_locations' ).prepend(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Inject additional heading into the menu locations section's head container.
+ api.section( 'menu_locations', function( section ) {
+ section.headContainer.prepend(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.template( 'nav-menu-locations-header' )( api.Menus.data )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- panel.contentContainer.find( '#accordion-section-add_menu .accordion-section-title' ).replaceWith(
- wp.template( 'nav-menu-create-menu-section-title' )
- );
</del><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1166,6 +1161,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> contentContainer = section.contentContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> navMenuSettingPattern = /^nav_menu\[/;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ section.headContainer.find( '.accordion-section-title' ).replaceWith(
+ wp.template( 'nav-menu-create-menu-section-title' )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We have to manually handle section expanded because we do not
</span><span class="cx" style="display: block; padding: 0 10px"> * apply the `accordion-section-title` class to this button-driven section.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,7 +1288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> menuLocationsControl = new api.controlConstructor.nav_menu_locations( menuLocationsControlId, {
</span><span class="cx" style="display: block; padding: 0 10px"> section: section.id,
</span><span class="cx" style="display: block; padding: 0 10px"> priority: 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu_id: ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menu_id: '',
+ isCreating: true
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> api.control.add( menuLocationsControlId, menuLocationsControl );
</span><span class="cx" style="display: block; padding: 0 10px"> menuLocationsControl.active.set( true );
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenulocationscontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php 2017-10-11 19:13:09 UTC (rev 41831)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php 2017-10-11 19:37:10 UTC (rev 41832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,13 +35,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function content_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_theme_supports( 'menus' ) ):
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_theme_supports( 'menus' ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# var elementId; #>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="menu-location-settings">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="customize-control assigned-menu-locations-title">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="customize-control-title"><?php _e( 'Menu Locations' ); ?></span>
- <p><?php _e( 'Here\'s where this menu appears. If you\'d like to change that, pick another location.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="customize-control-title">{{ wp.customize.Menus.data.l10n.locationsTitle }}</span>
+ <# if ( data.isCreating ) { #>
+ <p>
+ <?php echo _x( 'Where do you want this menu to appear?', 'menu locations' ); ?>
+ <em class="new-menu-locations-widget-note">
+ <?php
+ printf(
+ /* translators: 1: Codex URL, 2: additional link attributes, 3: accessibility text */
+ _x( '(If you plan to use a menu <a href="%1$s" %2$s>widget%3$s</a>, skip this step.)', 'menu locations' ),
+ __( 'https://codex.wordpress.org/WordPress_Widgets' ),
+ ' class="external-link" target="_blank"',
+ sprintf( '<span class="screen-reader-text"> %s</span>',
+ /* translators: accessibility text */
+ __( '(opens in a new window)' )
+ )
+ );
+ ?>
+ </em>
+ </p>
+ <# } else { #>
+ <p><?php echo _x( 'Here’s where this menu appears. If you’d like to change that, pick another location.', 'menu locations' ); ?></p>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( get_registered_nav_menus() as $location => $description ) : ?>
</span></span></pre>
</div>
</div>
</body>
</html>