<!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>[38767] trunk/src: Customize: Show Pages section first and pre-expanded in list of available nav menu items.</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/38767">38767</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/38767","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>2016-10-09 23:40:53 +0000 (Sun, 09 Oct 2016)</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: Show Pages section first and pre-expanded in list of available nav menu items.
Props ryankienstra, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/36984">#36984</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-10-09 21:08:34 UTC (rev 38766)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2016-10-09 23:40:53 UTC (rev 38767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,6 +397,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> self.pages[ type + ':' + object ] = -1;
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( 'page' === object ) {
+ availableMenuItemContainer.find( '.accordion-section-title > button' ).click();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> items = new api.Menus.AvailableItemCollection( items ); // @todo Why is this collection created and then thrown away?
</span><span class="cx" style="display: block; padding: 0 10px"> self.collection.add( items.models );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2016-10-09 21:08:34 UTC (rev 38766)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2016-10-09 23:40:53 UTC (rev 38767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,70 +895,112 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="accordion-section-content available-menu-items-list" data-type="search"></ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="new-custom-menu-item" class="accordion-section">
- <h4 class="accordion-section-title" role="presentation">
- <?php _e( 'Custom Links' ); ?>
- <button type="button" class="button-link" aria-expanded="false">
- <span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
- <span class="toggle-indicator" aria-hidden="true"></span>
- </button>
- </h4>
- <div class="accordion-section-content customlinkdiv">
- <input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
- <p id="menu-item-url-wrap" class="wp-clearfix">
- <label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
- <input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
- </p>
- <p id="menu-item-name-wrap" class="wp-clearfix">
- <label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
- <input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
- </p>
- <p class="button-controls">
- <span class="add-to-menu">
- <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
- <span class="spinner"></span>
- </span>
- </p>
- </div>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure the page post type comes first in the list.
+ $item_types = $this->available_item_types();
+ $page_item_type = null;
+ foreach ( $item_types as $i => $item_type ) {
+ if ( isset( $item_type['object'] ) && 'page' === $item_type['object'] ) {
+ $page_item_type = $item_type;
+ unset( $item_types[ $i ] );
+ }
+ }
+
+ if ( $page_item_type ) {
+ $this->print_post_type_container( $page_item_type );
+ }
+ $this->print_custom_links_available_menu_item();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Containers for per-post-type item browsing; items are added with JS.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $this->available_item_types() as $available_item_type ) {
- $id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
- ?>
- <div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
- <h4 class="accordion-section-title" role="presentation">
- <?php echo esc_html( $available_item_type['title'] ); ?>
- <span class="spinner"></span>
- <span class="no-items"><?php _e( 'No items' ); ?></span>
- <button type="button" class="button-link" aria-expanded="false">
- <span class="screen-reader-text"><?php
- /* translators: %s: Title of a section with menu items */
- printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
- <span class="toggle-indicator" aria-hidden="true"></span>
- </button>
- </h4>
- <div class="accordion-section-content">
- <?php if ( 'post_type' === $available_item_type['type'] ) : ?>
- <?php $post_type_obj = get_post_type_object( $available_item_type['object'] ); ?>
- <?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) ) : ?>
- <div class="new-content-item">
- <input type="text" class="create-item-input" placeholder="<?php echo esc_attr( $post_type_obj->labels->add_new_item ); ?>">
- <button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- <ul class="available-menu-items-list" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>" data-type_label="<?php echo esc_attr( isset( $available_item_type['type_label'] ) ? $available_item_type['type_label'] : $available_item_type['type'] ); ?>"></ul>
- </div>
- </div>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $item_types as $item_type ) {
+ $this->print_post_type_container( $item_type );
</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"> </div><!-- #available-menu-items -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">+ /**
+ * Print the markup for new menu items.
+ *
+ * To be used in the template #available-menu-items.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @param array $available_item_type Menu item data to output, including title, type, and label.
+ * @return void
+ */
+ protected function print_post_type_container( $available_item_type ) {
+ $id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+ ?>
+ <div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+ <h4 class="accordion-section-title" role="presentation">
+ <?php echo esc_html( $available_item_type['title'] ); ?>
+ <span class="spinner"></span>
+ <span class="no-items"><?php _e( 'No items' ); ?></span>
+ <button type="button" class="button-link" aria-expanded="false">
+ <span class="screen-reader-text"><?php
+ /* translators: %s: Title of a section with menu items */
+ printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ </h4>
+ <div class="accordion-section-content">
+ <?php if ( 'post_type' === $available_item_type['type'] ) : ?>
+ <?php $post_type_obj = get_post_type_object( $available_item_type['object'] ); ?>
+ <?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) ) : ?>
+ <div class="new-content-item">
+ <input type="text" class="create-item-input" placeholder="<?php echo esc_attr( $post_type_obj->labels->add_new_item ); ?>">
+ <button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
+ </div>
+ <?php endif; ?>
+ <?php endif; ?>
+ <ul class="available-menu-items-list" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>" data-type_label="<?php echo esc_attr( isset( $available_item_type['type_label'] ) ? $available_item_type['type_label'] : $available_item_type['type'] ); ?>"></ul>
+ </div>
+ </div>
+ <?php
+ }
+
+ /**
+ * Print the markup for available menu item custom links.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @return void
+ */
+ protected function print_custom_links_available_menu_item() {
+ ?>
+ <div id="new-custom-menu-item" class="accordion-section">
+ <h4 class="accordion-section-title" role="presentation">
+ <?php _e( 'Custom Links' ); ?>
+ <button type="button" class="button-link" aria-expanded="false">
+ <span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ </h4>
+ <div class="accordion-section-content customlinkdiv">
+ <input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
+ <p id="menu-item-url-wrap" class="wp-clearfix">
+ <label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+ <input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
+ </p>
+ <p id="menu-item-name-wrap" class="wp-clearfix">
+ <label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+ <input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
+ </p>
+ <p class="button-controls">
+ <span class="add-to-menu">
+ <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+ <span class="spinner"></span>
+ </span>
+ </p>
+ </div>
+ </div>
+ <?php
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px"> // Start functionality specific to partial-refresh of menu changes in Customizer preview.
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span></span></pre>
</div>
</div>
</body>
</html>