Changeset 15045

Timestamp:

05/28/2010 08:36:57 PM (15 years ago)

Author:

nacin

Message:

Make nav menu meta box tab ordering consistent across post types and taxonomies. see #13525.

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (3 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -784 +784 @@
         <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
             <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
+            <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all"><?php _e('View All'); ?></a></li>
             <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>"><?php _e('Search'); ?></a></li>
-            <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all"><?php _e('View All'); ?></a></li>
         </ul>
 
@@ -797 +797 @@
                 echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
                 ?>
-            </ul>
-        </div><!-- /.tabs-panel -->
-
-        <div class="tabs-panel <?php
-            echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-        ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-            <?php
-            if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-                $searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-                $search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
-            } else {
-                $searched = '';
-                $search_results = array();
-            }
-            ?>
-            <p class="quick-search-wrap">
-                <input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
-                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                <input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
-            </p>
-
-            <ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
-            <?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
-                <?php
-                $args['walker'] = $walker;
-                echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
-                ?>
-            <?php elseif ( is_wp_error( $search_results ) ) : ?>
-                <li><?php echo $search_results->get_error_message(); ?></li>
-            <?php elseif ( ! empty( $searched ) ) : ?>
-                <li><?php _e('No results found.'); ?></li>
-            <?php endif; ?>
             </ul>
         </div><!-- /.tabs-panel -->
@@ -853 +821 @@
         </div><!-- /.tabs-panel -->
 
+        <div class="tabs-panel <?php
+            echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+        ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+            <?php
+            if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+                $searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
+                $search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+            } else {
+                $searched = '';
+                $search_results = array();
+            }
+            ?>
+            <p class="quick-search-wrap">
+                <input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
+                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+                <input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
+            </p>
+
+            <ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
+            <?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+                <?php
+                $args['walker'] = $walker;
+                echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+                ?>
+            <?php elseif ( is_wp_error( $search_results ) ) : ?>
+                <li><?php echo $search_results->get_error_message(); ?></li>
+            <?php elseif ( ! empty( $searched ) ) : ?>
+                <li><?php _e('No results found.'); ?></li>
+            <?php endif; ?>
+            </ul>
+        </div><!-- /.tabs-panel -->
+
         <p class="button-controls">
             <span class="list-controls">