<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18198] trunk/wp-content/themes/twentyeleven/inc: Twenty Eleven: Properly handle the default link color for the dark theme.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18198">18198</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-06-08 17:39:12 +0000 (Wed, 08 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: Properly handle the default link color for the dark theme. props dcowgill for the patch refresh. fixes <a href="http://trac.wordpress.org/ticket/17351">#17351</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsjs">trunk/wp-content/themes/twentyeleven/inc/theme-options.js</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.js (18197 => 18198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.js 2011-06-08 17:35:48 UTC (rev 18197)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.js 2011-06-08 17:39:12 UTC (rev 18198)
</span><span class="lines">@@ -8,6 +8,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $(document).ready( function() {
</span><ins>+ $('#default-color').wrapInner('<a href="#" />');
+
</ins><span class="cx"> farbtastic = $.farbtastic('#colorPickerDiv', pickColor);
</span><span class="cx">
</span><span class="cx"> pickColor( $('#link-color').val() );
</span><span class="lines">@@ -31,5 +33,20 @@
</span><span class="cx"> $(document).mousedown( function() {
</span><span class="cx"> $('#colorPickerDiv').hide();
</span><span class="cx"> });
</span><ins>+
+ $('#default-color a').click( function(e) {
+ pickColor( '#' + this.innerHTML.replace(/[^a-fA-F0-9]/, '') );
+ e.preventDefault();
+ });
+
+ $('.image-radio-option input:radio').change( function() {
+ var currentDefault = $('#default-color a'),
+ newDefault;
+ if ( $('#link-color').val() !== currentDefault.text() )
+ return;
+ newDefault = $(this).next().val();
+ currentDefault.text( newDefault );
+ pickColor( newDefault );
+ });
</ins><span class="cx"> });
</span><span class="cx"> })(jQuery);
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (18197 => 18198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-06-08 17:35:48 UTC (rev 18197)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-06-08 17:39:12 UTC (rev 18198)
</span><span class="lines">@@ -118,11 +118,13 @@
</span><span class="cx"> 'value' => 'light',
</span><span class="cx"> 'label' => __( 'Light', 'twentyeleven' ),
</span><span class="cx"> 'thumbnail' => get_template_directory_uri() . '/inc/images/light.png',
</span><ins>+ 'default_link_color' => '#1b8be0',
</ins><span class="cx"> ),
</span><span class="cx"> 'dark' => array(
</span><span class="cx"> 'value' => 'dark',
</span><span class="cx"> 'label' => __( 'Dark', 'twentyeleven' ),
</span><span class="cx"> 'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png',
</span><ins>+ 'default_link_color' => '#e4741f',
</ins><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -164,7 +166,7 @@
</span><span class="cx"> function twentyeleven_get_default_theme_options() {
</span><span class="cx"> $default_theme_options = array(
</span><span class="cx"> 'color_scheme' => 'light',
</span><del>- 'link_color' => '#1b8be0',
</del><ins>+ 'link_color' => twentyeleven_get_default_link_color( 'light' ),
</ins><span class="cx"> 'theme_layout' => 'content-sidebar',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -172,6 +174,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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'];
+}
+
+/**
</ins><span class="cx"> * Returns the options array for Twenty Eleven.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="lines">@@ -205,14 +228,15 @@
</span><span class="cx"> <td>
</span><span class="cx"> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
</span><span class="cx"> <?php
</span><del>- foreach ( twentyeleven_color_schemes() as $color ) {
</del><ins>+ foreach ( twentyeleven_color_schemes() as $scheme ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="layout">
</span><span class="cx"> <label class="description">
</span><del>- <input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $color['value'] ); ?>" <?php checked( $options['color_scheme'], $color['value'] ); ?> />
</del><ins>+ <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'] ); ?>" />
</ins><span class="cx"> <span>
</span><del>- <img src="<?php echo esc_url( $color['thumbnail'] ); ?>" alt=""/>
- <?php echo $color['label']; ?>
</del><ins>+ <img src="<?php echo esc_url( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
+ <?php echo $scheme['label']; ?>
</ins><span class="cx"> </span>
</span><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="lines">@@ -231,7 +255,7 @@
</span><span class="cx"> <input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>" />
</span><span class="cx"> <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
</span><span class="cx"> <br />
</span><del>- <small class="description"><?php printf( __( 'Default color: %s', 'twentyeleven' ), $default_options['link_color'] ); ?></small>
</del><ins>+ <span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
</ins><span class="cx"> </fieldset>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -246,7 +270,7 @@
</span><span class="cx"> <label class="description">
</span><span class="cx"> <input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr( $layout['value'] ); ?>" <?php checked( $options['theme_layout'], $layout['value'] ); ?> />
</span><span class="cx"> <span>
</span><del>- <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" alt=""/>
</del><ins>+ <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" width="136" height="122" alt="" />
</ins><span class="cx"> <?php echo $layout['label']; ?>
</span><span class="cx"> </span>
</span><span class="cx"> </label>
</span><span class="lines">@@ -279,6 +303,9 @@
</span><span class="cx"> // Color scheme must be in our array of color scheme options
</span><span class="cx"> if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
</span><span class="cx"> $output['color_scheme'] = $input['color_scheme'];
</span><ins>+
+ // 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'] );
</ins><span class="cx">
</span><span class="cx"> // Link color must be 3 or 6 hexadecimal characters
</span><span class="cx"> if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
</span></span></pre>
</div>
</div>
</body>
</html>