Changeset 18198 for trunk/wp-content/themes/twentyeleven/inc/theme-options.php

Timestamp:

06/08/2011 05:39:12 PM (13 years ago)

Author:

nacin

Message:

Twenty Eleven: Properly handle the default link color for the dark theme. props dcowgill for the patch refresh. fixes #17351.

File:

• trunk/wp-content/themes/twentyeleven/inc/theme-options.php (modified) (7 diffs)

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

@@ -119 +119 @@
             'label' => __( 'Light', 'twentyeleven' ),
             'thumbnail' => get_template_directory_uri() . '/inc/images/light.png',
+            'default_link_color' => '#1b8be0',
         ),
         'dark' => array(
@@ -124 +125 @@
             'label' => __( 'Dark', 'twentyeleven' ),
             'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png',
+            'default_link_color' => '#e4741f',
         ),
     );
@@ -165 +167 @@
     $default_theme_options = array(
         'color_scheme' => 'light',
-        'link_color'   => '#1b8be0',
+        'link_color'   => twentyeleven_get_default_link_color( 'light' ),
         'theme_layout' => 'content-sidebar',
     );
 
     return apply_filters( 'twentyeleven_default_theme_options', $default_theme_options );
+}
+
+/**
+ * Returns the default link color for Twenty Eleven, based on color scheme.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param $string $color_scheme Color scheme. Defaults to the active color scheme.
+ * @return $string Color.
+*/
+function twentyeleven_get_default_link_color( $color_scheme = null ) {
+    if ( null === $color_scheme ) {
+        $options = twentyeleven_get_theme_options();
+        $color_scheme = $options['color_scheme'];
+    }
+
+    $color_schemes = twentyeleven_color_schemes();
+    if ( ! isset( $color_schemes[ $color_scheme ] ) )
+        return false;
+
+    return $color_schemes[ $color_scheme ]['default_link_color'];
 }
 
@@ -206 +229 @@
                         <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
                         <?php
-                            foreach ( twentyeleven_color_schemes() as $color ) {
+                            foreach ( twentyeleven_color_schemes() as $scheme ) {
                                 ?>
                                 <div class="layout">
                                 <label class="description">
-                                    <input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $color['value'] ); ?>" <?php checked( $options['color_scheme'], $color['value'] ); ?> />
+                                    <input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $scheme['value'] ); ?>" <?php checked( $options['color_scheme'], $scheme['value'] ); ?> />
+                                    <input type="hidden" id="default-color-<?php echo esc_attr( $scheme['value'] ); ?>" value="<?php echo esc_attr( $scheme['default_link_color'] ); ?>" />
                                     <span>
-                                        <img src="<?php echo esc_url( $color['thumbnail'] ); ?>" alt=""/>
-                                        <?php echo $color['label']; ?>
+                                        <img src="<?php echo esc_url( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
+                                        <?php echo $scheme['label']; ?>
                                     </span>
                                 </label>
@@ -232 +256 @@
                             <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
                             <br />
-                            <small class="description"><?php printf( __( 'Default color: %s', 'twentyeleven' ), $default_options['link_color'] ); ?></small>
+                            <span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span> 
                         </fieldset>
                     </td>
@@ -247 +271 @@
                                     <input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr( $layout['value'] ); ?>" <?php checked( $options['theme_layout'], $layout['value'] ); ?> />
                                     <span>
-                                        <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" alt=""/>
+                                        <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" width="136" height="122" alt="" />
                                         <?php echo $layout['label']; ?>
                                     </span>
@@ -280 +304 @@
     if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
         $output['color_scheme'] = $input['color_scheme'];
+        
+    // Our defaults for the link color may have changed, based on the color scheme. 
+    $output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
 
     // Link color must be 3 or 6 hexadecimal characters