Ticket #20448: 20448.diff

wp-includes/class-wp-customize.php

@@ -102 +102 @@
          * @since 3.4.0
          */
         public function wp_loaded() {
-                do_action( 'customize_register' );
+                do_action( 'customize_register', $this );
 
                 if ( $this->is_preview() && ! is_admin() )
                         $this->customize_preview_init();

wp-includes/theme.php

@@ -1578 +1578 @@
         require( ABSPATH . WPINC . '/class-wp-customize.php' );
         // Init Customize class
         // @todo Dependency injection instead
-        $GLOBALS['customize'] = new WP_Customize;
+        $GLOBALS['wp_customize'] = new WP_Customize;
 }
 add_action( 'plugins_loaded', '_wp_customize_include' );
 

wp-content/themes/twentyeleven/inc/theme-options.php

@@ -186 +186 @@
                 ),
                 'content' => array(
                         'value' => 'content',
-                        'label' => __( 'One-column, no sidebar', 'twentyeleven' ),
+                        'label' => __( 'One column, no sidebar', 'twentyeleven' ),
                         'thumbnail' => get_template_directory_uri() . '/inc/images/content.png',
                 ),
         );
@@ -389 +389 @@
         // Don't do anything if the current link color is the default.
         if ( $default_options['link_color'] == $link_color )
                 return;
+        $link_color = '#' . ltrim( $link_color, '#' );
 ?>
         <style>
                 /* Link color */
@@ -446 +447 @@
 
         return array_merge( $existing_classes, $classes );
 }
-add_filter( 'body_class', 'twentyeleven_layout_classes' );
- No newline at end of file
+add_filter( 'body_class', 'twentyeleven_layout_classes' );
+
+function twentyeleven_customize_register( $customize ) {
+        $defaults = twentyeleven_get_default_theme_options();
+
+        $customize->add_section( 'twentyeleven_colors', array(
+                'title' => __( 'Colors', 'twentyeleven' ),
+                'priority' => 33,
+        ) );
+
+        $customize->add_setting( 'twentyeleven_theme_options[color_scheme]', array(
+                'type' => 'option',
+                'default' => $defaults['color_scheme'],
+                'sanitize_callback' => 'sanitize_key',
+        ) );
+
+        $customize->add_control( 'twentyeleven_theme_options[color_scheme]', array(
+                'section' => 'twentyeleven_colors',
+                'label' => __( 'Color Scheme', 'twentyeleven'),
+                'type'       => 'radio',
+                'choices'    => array(
+                        'light' => __('Light', 'twentyeleven'),
+                        'dark'  => __('Dark', 'twentyeleven'),
+                ),
+        ) );
+
+        $customize->add_setting( 'twentyeleven_theme_options[link_color]', array(
+                'type' => 'option',
+                'default' => $defaults['link_color'],
+                'sanitize_callback' => 'sanitize_hexcolor',
+        ) );
+
+        $customize->add_control( 'twentyeleven_theme_options[link_color]', array(
+                'section' => 'twentyeleven_colors',
+                'label' => __( 'Link Color', 'twentyeleven' ),
+                'type' => 'color',
+        ) );
+
+        $customize->add_section( 'twentyeleven_layout', array(
+                'title'    => __( 'Default Layout', 'twentyeleven' ),
+                'priority' => 35,
+        ) );
+
+        $customize->add_setting( 'twentyeleven_theme_options[theme_layout]', array(
+                'type'              => 'option',
+                'default'           => $defaults['theme_layout'],
+                'sanitize_callback' => 'sanitize_key',
+        ) );
+
+        $customize->add_control( 'twentyeleven_theme_options[theme_layout]', array(
+                'section' => 'twentyeleven_layout',
+                'type'       => 'radio',
+                'choices'    => array(
+                        'content-sidebar'  => __('Content on left', 'twentyeleven'),
+                        'sidebar-content'  => __('Content on right', 'twentyeleven'),
+                        'content'          => __('One column, no sidebar', 'twentyeleven'),
+                ),
+        ) );
+}
+add_action( 'customize_register', 'twentyeleven_customize_register' );