Changeset 20572 for trunk/wp-includes/class-wp-customize.php

Timestamp:

04/23/2012 11:03:09 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Simplify logic when preparing menu controls. Include instructions to edit menu content in section description. Add string for default state. see #19910.

File:

• trunk/wp-includes/class-wp-customize.php (modified) (1 diff)

trunk/wp-includes/class-wp-customize.php

@@ -633 +633 @@
                         'theme_supports' => 'menus',
                         'priority'       => 40,
-                        'description'    => sprintf( _n('Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ),
-                ) );
-
-                foreach ( $locations as $location => $description ) {
-                        $choices = array( 0 => '' );
+                        'description'    => sprintf( _n('Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . "\n\n" . __('You can edit your menu content on the Menus screen in the Appearance section.'),
+                ) );
+
+                if ( $menus ) {
+                        $choices = array( 0 => __( '— Select —' ) );
                         foreach ( $menus as $menu ) {
                                 $truncated_name = wp_html_excerpt( $menu->name, 40 );
-                                $truncated_name == $menu->name ? $menu->name : trim( $truncated_name ) . '…';
+                                $truncated_name = ( $truncated_name == $menu->name ) ? $menu->name : trim( $truncated_name ) . '…';
                                 $choices[ $menu->term_id ] = $truncated_name;
                         }
 
-                        $menu_setting_id = "nav_menu_locations[{$location}]";
-
-                        $this->add_setting( $menu_setting_id, array(
-                                'sanitize_callback' => 'absint',
-                                'theme_supports'    => 'menus',
-                        ) );
-
-                        $this->add_control( $menu_setting_id, array(
-                                'label'   => $description,
-                                'section' => 'nav',
-                                'type'    => 'select',
-                                'choices' => $choices,
-                        ) );
+                        foreach ( $locations as $location => $description ) {
+                                $menu_setting_id = "nav_menu_locations[{$location}]";
+
+                                $this->add_setting( $menu_setting_id, array(
+                                        'sanitize_callback' => 'absint',
+                                        'theme_supports'    => 'menus',
+                                ) );
+
+                                $this->add_control( $menu_setting_id, array(
+                                        'label'   => $description,
+                                        'section' => 'nav',
+                                        'type'    => 'select',
+                                        'choices' => $choices,
+                                ) );
+                        }
                 }