<!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>[18455] trunk/wp-content/themes/twentyeleven/inc/theme-options.php: Use the Settings fields/sections API in Twenty Eleven.</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://core.trac.wordpress.org/changeset/18455">18455</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-07-21 21:37:31 +0000 (Thu, 21 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the Settings fields/sections API in Twenty Eleven. props chipbennett for initial patch. see <a href="http://core.trac.wordpress.org/ticket/18045">#18045</a>. for 3.3.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (18454 => 18455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-07-21 21:35:23 UTC (rev 18454)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-07-21 21:37:31 UTC (rev 18455)
</span><span class="lines">@@ -46,6 +46,26 @@
</span><span class="cx"> 'twentyeleven_theme_options', // Database option, see twentyeleven_get_theme_options()
</span><span class="cx"> 'twentyeleven_theme_options_validate' // The sanitization callback, see twentyeleven_theme_options_validate()
</span><span class="cx"> );
</span><ins>+
+ // Register our settings field group
+ add_settings_section(
+ 'general', // Unique identifier for the settings section
+ '', // Section title (we don't want one)
+ '__return_false', // Section callback (we don't want anything)
+ 'theme_options' // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
+ );
+
+ // Register our individual settings fields
+ add_settings_field(
+ 'color_scheme', // Unique identifier for the field for this section
+ __( 'Color Scheme', 'twentyeleven' ), // Setting field label
+ 'twentyeleven_settings_field_color_scheme', // Function that renders the settings field
+ 'theme_options', // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
+ 'general' // Settings section. Same as the first argument in the add_settings_section() above
+ );
+
+ add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
+ add_settings_field( 'layout', __( 'Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_init', 'twentyeleven_theme_options_init' );
</span><span class="cx">
</span><span class="lines">@@ -202,6 +222,69 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Renders the Color Scheme setting field.
+ *
+ * @since Twenty Eleven 1.2
+ */
+function twentyeleven_settings_field_color_scheme() {
+ $options = twentyeleven_get_theme_options();
+
+ foreach ( twentyeleven_color_schemes() as $scheme ) {
+ ?>
+ <div class="layout image-radio-option color-scheme">
+ <label class="description">
+ <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( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
+ <?php echo $scheme['label']; ?>
+ </span>
+ </label>
+ </div>
+ <?php
+ }
+}
+
+/**
+ * Renders the Link Color setting field.
+ *
+ * @since Twenty Eleven 1.2
+ */
+function twentyeleven_settings_field_link_color() {
+ $options = twentyeleven_get_theme_options();
+ ?>
+ <input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
+ <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' ); ?>" />
+ <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
+ <br />
+ <span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
+ <?php
+}
+
+/**
+ * Renders the Layout setting field.
+ *
+ * @since Twenty Eleven 1.2
+ */
+function twentyeleven_settings_field_layout() {
+ $options = twentyeleven_get_theme_options();
+ foreach ( twentyeleven_layouts() as $layout ) {
+ ?>
+ <div class="layout image-radio-option theme-layout">
+ <label class="description">
+ <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'] ); ?>" width="136" height="122" alt="" />
+ <?php echo $layout['label']; ?>
+ </span>
+ </label>
+ </div>
+ <?php
+ }
+}
+
+/**
</ins><span class="cx"> * Returns the options array for Twenty Eleven.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.2
</span><span class="lines">@@ -216,72 +299,11 @@
</span><span class="cx"> <form method="post" action="options.php">
</span><span class="cx"> <?php
</span><span class="cx"> settings_fields( 'twentyeleven_options' );
</span><del>- $options = twentyeleven_get_theme_options();
- $default_options = twentyeleven_get_default_theme_options();
- ?>
</del><span class="cx">
</span><del>- <table class="form-table">
</del><ins>+ do_settings_sections( 'theme_options' );
</ins><span class="cx">
</span><del>- <tr valign="top" class="image-radio-option color-scheme"><th scope="row"><?php _e( 'Color Scheme', 'twentyeleven' ); ?></th>
- <td>
- <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
- <?php
- 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( $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( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
- <?php echo $scheme['label']; ?>
- </span>
- </label>
- </div>
- <?php
- }
- ?>
- </fieldset>
- </td>
- </tr>
-
- <tr valign="top"><th scope="row"><?php _e( 'Link Color', 'twentyeleven' ); ?></th>
- <td>
- <fieldset><legend class="screen-reader-text"><span><?php _e( 'Link Color', 'twentyeleven' ); ?></span></legend>
- <input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
- <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' ); ?>" />
- <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
- <br />
- <span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
- </fieldset>
- </td>
- </tr>
-
- <tr valign="top" class="image-radio-option theme-layout"><th scope="row"><?php _e( 'Default Layout', 'twentyeleven' ); ?></th>
- <td>
- <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
- <?php
- foreach ( twentyeleven_layouts() as $layout ) {
- ?>
- <div class="layout">
- <label class="description">
- <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'] ); ?>" width="136" height="122" alt="" />
- <?php echo $layout['label']; ?>
- </span>
- </label>
- </div>
- <?php
- }
- ?>
- </fieldset>
- </td>
- </tr>
- </table>
-
- <?php submit_button(); ?>
</del><ins>+ submit_button();
+ ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>