<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17754] trunk/wp-content/themes/twentyeleven/inc: Twenty Eleven:
theme options - see #17198</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17754">17754</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2011-04-28 19:01:51 +0000 (Thu, 28 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: theme options - see <a href="http://trac.wordpress.org/ticket/17198">#17198</a>
* Make color swatch clickable to open palette
* Change color picker link to a submit button to match existing UI</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionscss">trunk/wp-content/themes/twentyeleven/inc/theme-options.css</a></li>
<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="trunkwpcontentthemestwentyelevenincthemeoptionscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.css (17753 => 17754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.css 2011-04-28 18:16:01 UTC (rev 17753)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.css 2011-04-28 19:01:51 UTC (rev 17754)
</span><span class="lines">@@ -21,11 +21,10 @@
</span><span class="cx"> margin: 0 0 0 -2px;
</span><span class="cx"> }
</span><span class="cx"> #link-color-example {
</span><del>- padding: 4px 14px;
- margin: 0 7px 0 3px;
</del><span class="cx"> -moz-border-radius: 4px;
</span><del>- -khtml-border-radius: 4px;
</del><span class="cx"> -webkit-border-radius: 4px;
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><ins>+ margin: 0 7px 0 3px;
+ padding: 4px 14px;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.js (17753 => 17754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.js 2011-04-28 18:16:01 UTC (rev 17753)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.js 2011-04-28 19:01:51 UTC (rev 17754)
</span><span class="lines">@@ -5,14 +5,14 @@
</span><span class="cx"> farbtastic.setColor(a);
</span><span class="cx"> $('#link-color').val(a);
</span><span class="cx"> $('#link-color-example').css('background-color', a);
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> $(document).ready( function() {
</span><span class="cx"> farbtastic = $.farbtastic('#colorPickerDiv', pickColor);
</span><span class="cx">
</span><span class="cx"> pickColor( $('#link-color').val() );
</span><span class="cx">
</span><del>- $('#pickcolor').click( function(e) {
</del><ins>+ $('.pickcolor').click( function(e) {
</ins><span class="cx"> $('#colorPickerDiv').show();
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (17753 => 17754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-04-28 18:16:01 UTC (rev 17753)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-04-28 19:01:51 UTC (rev 17754)
</span><span class="lines">@@ -192,7 +192,8 @@
</span><span class="cx"> <td>
</span><span class="cx"> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Link Color', 'twentyeleven' ); ?></span></legend>
</span><span class="cx"> <input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
</span><del>- <span id="link-color-example"></span> <a class="hide-if-no-js" href="#" id="pickcolor"><?php _e( 'Select a Color', 'twentyeleven' ); ?></a>
</del><ins>+ <a href="#" class="pickcolor hide-if-no-js" id="link-color-example"></a>
+ <input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>">
</ins><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><span class="cx"> <small class="description"><?php printf( __( 'Default color: %s', 'twentyeleven' ), $default_options['link_color'] ); ?></small>
</span><span class="lines">@@ -283,7 +284,7 @@
</span><span class="cx"> $link_color = $options['link_color'];
</span><span class="cx">
</span><span class="cx"> $default_options = twentyeleven_get_default_theme_options();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Don't do anything if the current link color is the default.
</span><span class="cx"> if ( $default_options['link_color'] == $link_color )
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>