Changeset 24048

Timestamp:

04/22/2013 07:33:39 PM (13 years ago)

Author:

nacin

Message:

Revert [23871] - Customize should be added to the menu, but not hacked in as first. see #21413.

Location:

trunk/wp-admin

Files:

• css/wp-admin-rtl.css (modified) (2 diffs)
• css/wp-admin.css (modified) (3 diffs)
• includes/menu.php (modified) (1 diff)
• menu-header.php (modified) (5 diffs)
• menu.php (modified) (1 diff)
• themes.php (modified) (2 diffs)

trunk/wp-admin/css/wp-admin-rtl.css

@@ -1318 +1318 @@
 }
 
+.theme-options .load-customize {
+        margin-right: 0;
+        margin-left: 30px;
+        float: right;
+}
+
 .theme-options span {
         float: right;
@@ -1324 +1330 @@
 }
 
-.theme-options ul,
-.theme-options .load-customize {
+.theme-options ul {
         float: right;
 }

trunk/wp-admin/css/wp-admin.css

@@ -5516 +5516 @@
 }
 
+.theme-options .load-customize {
+        margin-right: 30px;
+        float: left;
+}
+
 .theme-options span {
         float: left;
@@ -5525 +5530 @@
 }
 
-.theme-options ul,
-.theme-options .load-customize {
+.theme-options ul {
         float: left;
         margin: 0;
@@ -6456 +6460 @@
 .no-customize-support .wp-core-ui .hide-if-no-customize,
 .customize-support.wp-core-ui .hide-if-customize,
-.customize-support .wp-core-ui .hide-if-customize,
-.no-customize-support .theme-options ul li:first-child {
+.customize-support .wp-core-ui .hide-if-customize {
         display: none;
 }

trunk/wp-admin/includes/menu.php

@@ -74 +74 @@
         // If the first submenu is not the same as the assigned parent,
         // make the first submenu the new parent.
-        if ( $new_parent != $old_parent && 'customize.php' != $new_parent ) {
+        if ( $new_parent != $old_parent ) {
                 $_wp_real_parent_file[$old_parent] = $new_parent;
                 $menu[$id][2] = $new_parent;

trunk/wp-admin/menu-header.php

@@ -54 +54 @@
                         $submenu_items = $submenu[$item[2]];
                 }
-                
+
                 if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
                         $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
@@ -83 +83 @@
                         echo '<div class="separator"></div>';
                 } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
-                        $temp_submenu_items = $submenu_items = array_values( $submenu_items );  // Re-index.
-                        if ( 'customize.php' == $submenu_items[0][2] )
-                                $submenu_items[0][2] = 'themes.php';
+                        $submenu_items = array_values( $submenu_items );  // Re-index.
                         $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
                         $menu_file = $submenu_items[0][2];
@@ -96 +94 @@
                                 echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";
                         }
-                        $submenu_items = $temp_submenu_items;
                 } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
                         $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -109 +106 @@
                         }
                 }
-                
+
                 if ( ! empty( $submenu_items ) ) {
                         echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
@@ -144 +141 @@
                                         $class[] = 'current';
                                 }
-                                
-                                if ( ! empty( $sub_item[3] ) )
-                                        $class[] = $sub_item[3];
 
                                 $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';

trunk/wp-admin/menu.php

@@ -138 +138 @@
 
 $appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
- 
+
 $menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
-        $submenu['themes.php'][4] = array( __( 'Customize' ), $appearance_cap, 'customize.php', 'hide-if-no-customize' ); 
-        $submenu['themes.php'][5] = array(__( 'Themes' ), $appearance_cap, 'themes.php');
+        $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
+        $submenu['themes.php'][6] = array( __( 'Customize' ), $appearance_cap, 'customize.php', 'hide-if-no-customize' );
         if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
                 $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');

trunk/wp-admin/themes.php

@@ -160 +160 @@
                 foreach ( (array) $submenu['themes.php'] as $item) {
                         $class = '';
-                        if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] )
+                        if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 'customize.php' == $item[2] )
                                 continue;
-                        if ( 'customize.php' == $item[2] ) {
-                                if ( current_user_can( 'edit_theme_options' ) )
-                                        $class = ' class="load-customize hide-if-no-customize"';
-                                else
-                                        continue;
-                        }
                         // 0 = name, 1 = capability, 2 = file
                         if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
@@ -194 +188 @@
         ?>
         <div class="theme-options">
-                <?php if ( $options ) : ?>
+                <?php if ( current_user_can( 'edit_theme_options' ) ) : ?>
+                <a id="customize-current-theme-link" href="<?php echo wp_customize_url(); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( $customize_title ); ?>"><?php _e( 'Customize' ); ?></a>
+                <?php
+                endif; // edit_theme_options
+                if ( $options ) :
+                ?>
                 <span><?php _e( 'Options:' )?></span>
                 <ul>