<!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>[20222] trunk/wp-content/themes/twentyeleven/functions.php: Update twentyeleven/functions.php to use the new add_theme_support() calls for backgrounds and headers.</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/20222">20222</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-20 20:37:53 +0000 (Tue, 20 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update twentyeleven/functions.php to use the new add_theme_support() calls for backgrounds and headers. props sabreuse for initial patch. see <a href="http://core.trac.wordpress.org/ticket/20265">#20265</a>. see <a href="http://core.trac.wordpress.org/ticket/20249">#20249</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (20221 => 20222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2012-03-20 20:34:49 UTC (rev 20221)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2012-03-20 20:37:53 UTC (rev 20222)
</span><span class="lines">@@ -103,43 +103,40 @@
</span><span class="cx"> // Add support for a variety of post formats
</span><span class="cx"> add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
</span><span class="cx">
</span><del>- // Add support for custom backgrounds
- add_custom_background();
</del><ins>+ // Add support for custom backgrounds.
+ add_theme_support( 'custom-background' );
</ins><span class="cx">
</span><span class="cx"> // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
</span><span class="cx"> add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><del>- // The next four constants set how Twenty Eleven supports custom headers.
</del><ins>+ // Add support for custom headers.
+ add_theme_support( 'custom-header', array(
+ // The default header text color.
+ 'default-text-color' => '000',
+ // The height and width of our custom header.
+ 'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
+ 'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
+ // Random image rotation by default.
+ 'random-default' => true,
+ // Callback for styling the header.
+ 'callback' => 'twentyeleven_header_style',
+ // Callback for styling the header preview in the admin.
+ 'admin-header-callback' => 'twentyeleven_admin_header_style',
+ // Callback used to display the header preview in the admin.
+ 'admin-image-div-callback' => 'twentyeleven_admin_header_image',
+ ) );
</ins><span class="cx">
</span><del>- // The default header text color
- define( 'HEADER_TEXTCOLOR', '000' );
-
- // By leaving empty, we allow for random image rotation.
- define( 'HEADER_IMAGE', '' );
-
- // The height and width of your custom header.
- // Add a filter to twentyeleven_header_image_width and twentyeleven_header_image_height to change these values.
- define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyeleven_header_image_width', 1000 ) );
- define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyeleven_header_image_height', 288 ) );
-
</del><span class="cx"> // We'll be using post thumbnails for custom header images on posts and pages.
</span><span class="cx"> // We want them to be the size of the header image that we just defined
</span><span class="cx"> // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
</span><del>- set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
</del><ins>+ set_post_thumbnail_size( get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ), true );
</ins><span class="cx">
</span><del>- // Add Twenty Eleven's custom image sizes
- add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature (header) images
- add_image_size( 'small-feature', 500, 300 ); // Used for featured posts if a large-feature doesn't exist
</del><ins>+ // Add Twenty Eleven's custom image sizes.
+ // Used for large feature (header) images.
+ add_image_size( 'large-feature', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ), true );
+ // Used for featured posts if a large-feature doesn't exist.
+ add_image_size( 'small-feature', 500, 300 );
</ins><span class="cx">
</span><del>- // Turn on random header image rotation by default.
- add_theme_support( 'custom-header', array( 'random-default' => true ) );
-
- // Add a way for the custom header to be styled in the admin panel that controls
- // custom headers. See twentyeleven_admin_header_style(), below.
- add_custom_image_header( 'twentyeleven_header_style', 'twentyeleven_admin_header_style', 'twentyeleven_admin_header_image' );
-
- // ... and thus ends the changeable header business.
-
</del><span class="cx"> // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
</span><span class="cx"> register_default_headers( array(
</span><span class="cx"> 'wheel' => array(
</span><span class="lines">@@ -201,17 +198,17 @@
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_header_style() {
</span><ins>+ $text_color = get_header_textcolor();
</ins><span class="cx">
</span><del>- // If no custom options for text are set, let's bail
- // get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value
- if ( HEADER_TEXTCOLOR == get_header_textcolor() )
</del><ins>+ // If no custom options for text are set, let's bail.
+ if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
</ins><span class="cx"> return;
</span><span class="cx"> // If we get this far, we have custom styles. Let's do this.
</span><span class="cx"> ?>
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> <?php
</span><span class="cx"> // Has the text been hidden?
</span><del>- if ( 'blank' == get_header_textcolor() ) :
</del><ins>+ if ( 'blank' == $text_color ) :
</ins><span class="cx"> ?>
</span><span class="cx"> #site-title,
</span><span class="cx"> #site-description {
</span><span class="lines">@@ -225,7 +222,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> #site-title a,
</span><span class="cx"> #site-description {
</span><del>- color: #<?php echo get_header_textcolor(); ?> !important;
</del><ins>+ color: #<?php echo $text_color; ?> !important;
</ins><span class="cx"> }
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </style>
</span><span class="lines">@@ -266,7 +263,7 @@
</span><span class="cx"> }
</span><span class="cx"> <?php
</span><span class="cx"> // If the user has set a custom color for the text use that
</span><del>- if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
</del><ins>+ if ( get_header_textcolor() != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</ins><span class="cx"> ?>
</span><span class="cx"> #site-title a,
</span><span class="cx"> #site-description {
</span><span class="lines">@@ -294,16 +291,17 @@
</span><span class="cx"> function twentyeleven_admin_header_image() { ?>
</span><span class="cx"> <div id="headimg">
</span><span class="cx"> <?php
</span><del>- if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) )
- $style = ' style="display:none;"';
</del><ins>+ $color = get_header_textcolor();
+ $image = get_header_image();
+ if ( $color && $color != 'blank' )
+ $style = ' style="color:#' . $color . '"';
</ins><span class="cx"> else
</span><del>- $style = ' style="color:#' . get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) . ';"';
</del><ins>+ $style = ' style="display:none"';
</ins><span class="cx"> ?>
</span><span class="cx"> <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx"> <div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
</span><del>- <?php $header_image = get_header_image();
- if ( ! empty( $header_image ) ) : ?>
- <img src="<?php echo esc_url( $header_image ); ?>" alt="" />
</del><ins>+ <?php if ( $image ) : ?>
+ <img src="<?php echo esc_url( $image ); ?>" alt="" />
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php }
</span></span></pre>
</div>
</div>
</body>
</html>