<!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>[18272] trunk/wp-content/themes/twentyeleven/functions.php: Twenty Eleven Functions.php comments cleanup, merge the 2 body class functions.</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/18272">18272</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-06-11 06:30:59 +0000 (Sat, 11 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven Functions.php comments cleanup, merge the 2 body class functions. Props jorbin. See <a href="http://trac.wordpress.org/ticket/17748">#17748</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 (18271 => 18272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2011-06-11 05:47:28 UTC (rev 18271)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2011-06-11 06:30:59 UTC (rev 18272)
</span><span class="lines">@@ -100,39 +100,35 @@
</span><span class="cx"> // This theme uses wp_nav_menu() in one location.
</span><span class="cx"> register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
</span><span class="cx">
</span><del>- /**
- * Add support for an Aside Post Format
- */
</del><ins>+ // Add support for a variety of post formats
</ins><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
- */
</del><ins>+ // Add support for custom backgrounds
</ins><span class="cx"> add_custom_background();
</span><span class="cx">
</span><del>- // This theme uses Feature Images for per-post/per-page Custom Header images
</del><ins>+ // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
</ins><span class="cx"> add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><del>- /**
- * Add support for Custom Headers
- */
</del><ins>+ // The next four constants set how twentyeleven supports custom headers
+
+ // The default header text color
</ins><span class="cx"> define( 'HEADER_TEXTCOLOR', '000' );
</span><span class="cx">
</span><del>- // No CSS, just an IMG call. The %s is a placeholder for the theme template directory URI.
- define( 'HEADER_IMAGE', '' ); // Leaving empty for random image rotation.
</del><ins>+ // By leaving empty, we default to random image rotation
+ define( 'HEADER_IMAGE', '' );
</ins><span class="cx">
</span><del>- // The height and width of your custom header. You can hook into the theme's own filters to change these values.
</del><ins>+ // The height and width of your custom header.
</ins><span class="cx"> // Add a filter to twentyeleven_header_image_width and twentyeleven_header_image_height to change these values.
</span><span class="cx"> define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyeleven_header_image_width', 1000 ) );
</span><span class="cx"> define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyeleven_header_image_height', 288 ) );
</span><span class="cx">
</span><span class="cx"> // We'll be using post thumbnails for custom header images on posts and pages.
</span><del>- // We want them to be 1000 pixels wide by 288 pixels tall.
</del><ins>+ // We want them to be the size of the header image that we just defined
</ins><span class="cx"> // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
</span><span class="cx"> set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
</span><span class="cx">
</span><span class="cx"> // Add Twenty Eleven's custom image sizes
</span><del>- add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature images
</del><ins>+ add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature (header) images
</ins><span class="cx"> add_image_size( 'small-feature', 500, 300 ); // Used for featured posts if a large-feature doesn't exist
</span><span class="cx">
</span><span class="cx"> // Add a way for the custom header to be styled in the admin panel that controls
</span><span class="lines">@@ -354,17 +350,6 @@
</span><span class="cx"> add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add custom body classes
- */
-function twentyeleven_singular_class( $classes ) {
- if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
- $classes[] = 'singular';
-
- return $classes;
-}
-add_filter( 'body_class', 'twentyeleven_singular_class' );
-
-/**
</del><span class="cx"> * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_page_menu_args( $args ) {
</span><span class="lines">@@ -563,6 +548,7 @@
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Prints HTML with meta information for the current post-date/time and author.
</span><ins>+ * Create your own twentyeleven_posted_on to override in a child theme
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -580,16 +566,22 @@
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds Twenty Eleven author class to the array of body classes.
</del><ins>+ * Adds two classes to the array of body classes.
+ * The first is if the site has only had one author with published posts.
+ * The second is if a singular post being displayed
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><del>-function twentyeleven_author_class( $classes ) {
</del><ins>+function twentyeleven_body_classes( $classes ) {
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multi_author() ) {
</span><span class="cx"> $classes[] = 'single-author';
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
+ $classes[] = 'singular';
+
</ins><span class="cx"> return $classes;
</span><span class="cx"> }
</span><del>-add_filter( 'body_class', 'twentyeleven_author_class' );
</del><ins>+add_filter( 'body_class', 'twentyeleven_body_classes' );
+
</ins></span></pre>
</div>
</div>
</body>
</html>