Changeset 20912 for trunk/wp-includes/class-wp-customize-manager.php

Timestamp:

05/25/2012 07:52:54 PM (13 years ago)

Author:

koopersmith

Message:

Theme Customizer: Section reorganization. see #19910.

Now that sections are organized in accordions, group items by size and usage.
Move header/background controls into colors, header image, background image, and title/tagline sections.

File:

• trunk/wp-includes/class-wp-customize-manager.php (modified) (11 diffs)

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

@@ -601 +601 @@
     public function register_controls() {
 
-        /* Custom Header */
-
-        $this->add_section( 'header', array(
-            'title'          => __( 'Header' ),
-            'theme_supports' => 'custom-header',
-            'priority'       => 20,
+        /* Site Title & Tagline */
+
+        $this->add_section( 'title_tagline', array(
+            'title'    => __( 'Site Title & Tagline' ),
+            'priority' => 20,
+        ) );
+
+        $this->add_setting( 'blogname', array(
+            'default'    => get_option( 'blogname' ),
+            'type'       => 'option',
+            'capability' => 'manage_options',
+        ) );
+
+        $this->add_control( 'blogname', array(
+            'label'      => __( 'Site Title' ),
+            'section'    => 'title_tagline',
+        ) );
+
+        $this->add_setting( 'blogdescription', array(
+            'default'    => get_option( 'blogdescription' ),
+            'type'       => 'option',
+            'capability' => 'manage_options',
+        ) );
+
+        $this->add_control( 'blogdescription', array(
+            'label'      => __( 'Tagline' ),
+            'section'    => 'title_tagline',
+        ) );
+
+        /* Colors */
+
+        $this->add_section( 'colors', array(
+            'title'          => __( 'Colors' ),
+            'priority'       => 40,
         ) );
 
@@ -615 +643 @@
         ) );
 
+        // Input type: checkbox
+        // With custom value
         $this->add_control( 'display_header_text', array(
             'settings' => 'header_textcolor',
             'label'    => __( 'Display Header Text' ),
-            'section'  => 'header',
+            'section'  => 'title_tagline',
             'type'     => 'checkbox',
         ) );
@@ -624 +654 @@
         $this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
             'label'   => __( 'Text Color' ),
-            'section' => 'header',
+            'section' => 'colors',
         ) ) );
-
-        // Input type: checkbox
-        // With custom value
-        $this->add_setting( 'header_image', array(
-            'default'        => get_theme_support( 'custom-header', 'default-image' ),
-            'theme_supports' => 'custom-header',
-        ) );
-
-        $this->add_control( new WP_Customize_Header_Image_Control( $this ) );
-
-        /* Custom Background */
-
-        $this->add_section( 'background', array(
-            'title'          => __( 'Background' ),
-            'theme_supports' => 'custom-background',
-            'priority'       => 30,
-        ) );
 
         // Input type: Color
@@ -654 +667 @@
         $this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
             'label'   => __( 'Background Color' ),
-            'section' => 'background',
+            'section' => 'colors',
         ) ) );
+
+
+        /* Custom Header */
+
+        $this->add_section( 'header_image', array(
+            'title'          => __( 'Header Image' ),
+            'theme_supports' => 'custom-header',
+            'priority'       => 60,
+        ) );
+
+        $this->add_setting( 'header_image', array(
+            'default'        => get_theme_support( 'custom-header', 'default-image' ),
+            'theme_supports' => 'custom-header',
+        ) );
+
+        $this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+
+        /* Custom Background */
+
+        $this->add_section( 'background_image', array(
+            'title'          => __( 'Background Image' ),
+            'theme_supports' => 'custom-background',
+            'priority'       => 80,
+        ) );
 
         $this->add_setting( 'background_image', array(
@@ -664 +701 @@
         $this->add_control( new WP_Customize_Image_Control( $this, 'background_image', array(
             'label'          => __( 'Background Image' ),
-            'section'        => 'background',
+            'section'        => 'background_image',
             'context'        => 'custom-background',
         ) ) );
@@ -675 +712 @@
         $this->add_control( 'background_repeat', array(
             'label'      => __( 'Background Repeat' ),
-            'section'    => 'background',
+            'section'    => 'background_image',
             'type'       => 'radio',
             'choices'    => array(
@@ -692 +729 @@
         $this->add_control( 'background_position_x', array(
             'label'      => __( 'Background Position' ),
-            'section'    => 'background',
+            'section'    => 'background_image',
             'type'       => 'radio',
             'choices'    => array(
@@ -708 +745 @@
         $this->add_control( 'background_attachment', array(
             'label'      => __( 'Background Attachment' ),
-            'section'    => 'background',
+            'section'    => 'background_image',
             'type'       => 'radio',
             'choices'    => array(
@@ -734 +771 @@
             'title'          => __( 'Navigation' ),
             'theme_supports' => 'menus',
-            'priority'       => 40,
+            'priority'       => 100,
             '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.'),
         ) );
@@ -769 +806 @@
             'title'          => __( 'Static Front Page' ),
         //  'theme_supports' => 'static-front-page',
-            'priority'       => 50,
+            'priority'       => 120,
             'description'    => __( 'Your theme supports a static front page.' ),
         ) );
@@ -813 +850 @@
             'type'       => 'dropdown-pages',
         ) );
-
-        /* Site Title & Tagline */
-
-        $this->add_section( 'strings', array(
-            'title'    => __( 'Site Title & Tagline' ),
-            'priority' => 5,
-        ) );
-
-        $this->add_setting( 'blogname', array(
-            'default'    => get_option( 'blogname' ),
-            'type'       => 'option',
-            'capability' => 'manage_options',
-        ) );
-
-        $this->add_control( 'blogname', array(
-            'label'      => __( 'Site Title' ),
-            'section'    => 'strings',
-        ) );
-
-        $this->add_setting( 'blogdescription', array(
-            'default'    => get_option( 'blogdescription' ),
-            'type'       => 'option',
-            'capability' => 'manage_options',
-        ) );
-
-        $this->add_control( 'blogdescription', array(
-            'label'      => __( 'Tagline' ),
-            'section'    => 'strings',
-        ) );
     }
 };