<!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>[17802] trunk/wp-content/themes/twentyeleven: Twenty Eleven updates and fixes, see #17198</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/17802">17802</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2011-05-04 22:54:50 +0000 (Wed, 04 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven updates and fixes, see <a href="http://trac.wordpress.org/ticket/17198">#17198</a>
* Add explanatory comments in all templates, following Twenty Ten's example
* Stick with twentyeleven_ for prefixing filter names
* Use post format content templates in search results
* First pass at adding a template for adding a sidebar to pages
* Add a featured post header to standard sticky posts
* Style fixes: print media, comment styles for pages with sidebars, color of meta links on image post format</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenarchivephp">trunk/wp-content/themes/twentyeleven/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenauthorphp">trunk/wp-content/themes/twentyeleven/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencategoryphp">trunk/wp-content/themes/twentyeleven/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencommentsphp">trunk/wp-content/themes/twentyeleven/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentphp">trunk/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenfooterphp">trunk/wp-content/themes/twentyeleven/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenheaderphp">trunk/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenimagephp">trunk/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensearchphp">trunk/wp-content/themes/twentyeleven/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenstylecss">trunk/wp-content/themes/twentyeleven/style.css</a></li>
<li><a href="#trunkwpcontentthemestwentyeleventagphp">trunk/wp-content/themes/twentyeleven/tag.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevensidebarfooterphp">trunk/wp-content/themes/twentyeleven/sidebar-footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensidebarpagephp">trunk/wp-content/themes/twentyeleven/sidebar-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/archive.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/archive.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/archive.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -17,7 +17,16 @@
</span><span class="cx"> <section id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php
+ /* Queue the first post, that way we know
+ * what date we're dealing with (if that is the case).
+ *
+ * We reset this later so we can run the loop
+ * properly with a call to rewind_posts().
+ */
+ if ( have_posts() )
+ the_post();
+ ?>
</ins><span class="cx">
</span><span class="cx"> <header class="page-header">
</span><span class="cx"> <h1 class="page-title">
</span><span class="lines">@@ -33,14 +42,26 @@
</span><span class="cx"> </h1>
</span><span class="cx"> </header>
</span><span class="cx">
</span><del>- <?php rewind_posts(); ?>
</del><ins>+ <?php
+ /* Since we called the_post() above, we need to
+ * rewind the loop back to the beginning that way
+ * we can run the loop properly, in full.
+ */
+ rewind_posts();
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php twentyeleven_content_nav( 'nav-above' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <?php get_template_part( 'content', get_post_format() ); ?>
</del><ins>+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called loop-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/author.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/author.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/author.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -12,13 +12,28 @@
</span><span class="cx"> <section id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php the_post(); ?>
</del><ins>+ <?php
+ /* Queue the first post, that way we know
+ * what date we're dealing with (if that is the case).
+ *
+ * We reset this later so we can run the loop
+ * properly with a call to rewind_posts().
+ */
+ if ( have_posts() )
+ the_post();
+ ?>
</ins><span class="cx">
</span><span class="cx"> <header class="page-header">
</span><span class="cx"> <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyeleven' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</span><span class="cx"> </header>
</span><span class="cx">
</span><del>- <?php rewind_posts(); ?>
</del><ins>+ <?php
+ /* Since we called the_post() above, we need to
+ * rewind the loop back to the beginning that way
+ * we can run the loop properly, in full.
+ */
+ rewind_posts();
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php twentyeleven_content_nav( 'nav-above' ); ?>
</span><span class="cx">
</span><span class="lines">@@ -39,7 +54,13 @@
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <?php get_template_part( 'content', get_post_format() ); ?>
</del><ins>+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called loop-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/category.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/category.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/category.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -25,7 +25,13 @@
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <?php get_template_part( 'content', get_post_format() ); ?>
</del><ins>+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called loop-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/comments.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/comments.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/comments.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -16,7 +16,12 @@
</span><span class="cx"> <?php if ( post_password_required() ) : ?>
</span><span class="cx"> <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></div>
</span><span class="cx"> </div><!-- .comments -->
</span><del>- <?php return;
</del><ins>+ <?php
+ /* Stop the rest of comments.php from being processed,
+ * but don't kill the script entirely -- we still have
+ * to fully load the template.
+ */
+ return;
</ins><span class="cx"> endif;
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -39,7 +44,15 @@
</span><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><del>- <?php wp_list_comments( array( 'callback' => 'twentyeleven_comment' ) ); ?>
</del><ins>+ <?php
+ /* Loop through and list the comments. Tell wp_list_comments()
+ * to use twentyeleven_comment() to format the comments.
+ * If you want to overload this in a child theme then you can
+ * define twentyeleven_comment() and that will be used instead.
+ * See twentyeleven_comment() in twentyeleven/functions.php for more.
+ */
+ wp_list_comments( array( 'callback' => 'twentyeleven_comment' ) );
+ ?>
</ins><span class="cx"> </ol>
</span><span class="cx">
</span><span class="cx"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/content.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -10,7 +10,14 @@
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <header class="entry-header">
</span><ins>+ <?php if ( is_sticky() ) : ?>
+ <hgroup>
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+ <h2 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h2>
+ </hgroup>
+ <?php else : ?>
</ins><span class="cx"> <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</span><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( 'post' == $post->post_type ) : ?>
</span><span class="cx"> <div class="entry-meta">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/footer.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/footer.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/footer.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -14,28 +14,13 @@
</span><span class="cx">
</span><span class="cx"> <footer id="colophon" role="contentinfo">
</span><span class="cx">
</span><del>- <?php if ( is_active_sidebar( 'sidebar-3' ) || is_active_sidebar( 'sidebar-4' ) || is_active_sidebar( 'sidebar-5' ) ) : ?>
- <div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
- <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
- <div id="first" class="widget-area" role="complementary">
- <?php dynamic_sidebar( 'sidebar-3' ); ?>
- </div><!-- #first .widget-area -->
- <?php endif; ?>
</del><ins>+ <?php
+ /* A sidebar in the footer? Yep. You can can customize
+ * your footer with three columns of widgets.
+ */
+ get_sidebar( 'footer' );
+ ?>
</ins><span class="cx">
</span><del>- <?php if ( is_active_sidebar( 'sidebar-4' ) ) : ?>
- <div id="second" class="widget-area" role="complementary">
- <?php dynamic_sidebar( 'sidebar-4' ); ?>
- </div><!-- #second .widget-area -->
- <?php endif; ?>
-
- <?php if ( is_active_sidebar( 'sidebar-5' ) ) : ?>
- <div id="third" class="widget-area" role="complementary">
- <?php dynamic_sidebar( 'sidebar-5' ); ?>
- </div><!-- #third .widget-area -->
- <?php endif; ?>
- </div><!-- #supplementary -->
- <?php endif; ?>
-
</del><span class="cx"> <div id="site-generator">
</span><span class="cx"> <a href="http://wordpress.org/" rel="generator">Proudly powered by WordPress</a><span class="sep"> | </span><?php printf( __( 'Theme: %1$s.', 'twentyeleven' ), 'Twenty Eleven' ); ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> * Add custom body classes
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_singular_class( $classes ) {
</span><del>- if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) )
</del><ins>+ if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
</ins><span class="cx"> $classes[] = 'singular';
</span><span class="cx">
</span><span class="cx"> return $classes;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/header.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/header.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/header.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -47,13 +47,24 @@
</span><span class="cx"> ?></title>
</span><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</span><del>-<?php if ( is_singular() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?>
</del><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><span class="cx"> <!--[if lt IE 9]>
</span><span class="cx"> <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
</span><span class="cx"> <![endif]-->
</span><ins>+<?php
+ /* We add some JavaScript to pages with the comment form
+ * to support sites with threaded comments (when in use).
+ */
+ if ( is_singular() && get_option( 'thread_comments' ) )
+ wp_enqueue_script( 'comment-reply' );
</ins><span class="cx">
</span><del>-<?php wp_head(); ?>
</del><ins>+ /* Always have wp_head() just before the closing </head>
+ * tag of your theme, or you will break many plugins, which
+ * generally use this hook to add elements to <head> such
+ * as styles, scripts, and meta tags.
+ */
+ wp_head();
+?>
</ins><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class(); ?>>
</span><span class="lines">@@ -100,8 +111,9 @@
</span><span class="cx">
</span><span class="cx"> <nav id="access" role="navigation">
</span><span class="cx"> <h1 class="section-heading"><?php _e( 'Main menu', 'twentyeleven' ); ?></h1>
</span><ins>+ <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. */ ?>
</ins><span class="cx"> <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyeleven' ); ?>"><?php _e( 'Skip to content', 'twentyeleven' ); ?></a></div>
</span><del>-
</del><ins>+ <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
</ins><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </nav><!-- #access -->
</span><span class="cx"> </header><!-- #branding -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/image.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/image.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/image.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
</span><del>- $attachment_size = apply_filters( 'theme_attachment_size', 848 );
</del><ins>+ $attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
</ins><span class="cx"> echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
</span><span class="cx"> ?></a>
</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 (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -295,7 +295,8 @@
</span><span class="cx"> .entry-title a:hover,
</span><span class="cx"> .widget_twentyeleven_ephemera .comments-link a:hover,
</span><span class="cx"> section.recent-posts .other-recent-posts a[rel="bookmark"]:hover,
</span><del>- section.recent-posts .other-recent-posts .comments-link a:hover {
</del><ins>+ section.recent-posts .other-recent-posts .comments-link a:hover,
+ .format-image footer.entry-meta a:hover {
</ins><span class="cx"> color: <?php echo $link_color; ?>;
</span><span class="cx"> }
</span><span class="cx"> section.recent-posts .other-recent-posts .comments-link a:hover {
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/search.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/search.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/search.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -23,7 +23,13 @@
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <?php get_template_part( 'content', 'search' ); ?>
</del><ins>+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called loop-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensidebarfooterphp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentyeleven/sidebar-footer.php (0 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/sidebar-footer.php (rev 0)
+++ trunk/wp-content/themes/twentyeleven/sidebar-footer.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<?php
+/**
+ * The Footer widget areas.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Eleven
+ * @since Twenty Eleven 1.0
+ */
+?>
+
+<?php
+ /* The footer widget area is triggered if any of the areas
+ * have widgets. So let's check that first.
+ *
+ * If none of the sidebars have widgets, then let's bail early.
+ */
+ if ( ! is_active_sidebar( 'sidebar-3' )
+ && ! is_active_sidebar( 'sidebar-4' )
+ && ! is_active_sidebar( 'sidebar-5' )
+ )
+ return;
+ // If we get this far, we have widgets. Let do this.
+?>
+<div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
+ <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
+ <div id="first" class="widget-area" role="complementary">
+ <?php dynamic_sidebar( 'sidebar-3' ); ?>
+ </div><!-- #first .widget-area -->
+ <?php endif; ?>
+
+ <?php if ( is_active_sidebar( 'sidebar-4' ) ) : ?>
+ <div id="second" class="widget-area" role="complementary">
+ <?php dynamic_sidebar( 'sidebar-4' ); ?>
+ </div><!-- #second .widget-area -->
+ <?php endif; ?>
+
+ <?php if ( is_active_sidebar( 'sidebar-5' ) ) : ?>
+ <div id="third" class="widget-area" role="complementary">
+ <?php dynamic_sidebar( 'sidebar-5' ); ?>
+ </div><!-- #third .widget-area -->
+ <?php endif; ?>
+</div><!-- #supplementary -->
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensidebarpagephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentyeleven/sidebar-page.php (0 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/sidebar-page.php (rev 0)
+++ trunk/wp-content/themes/twentyeleven/sidebar-page.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<?php
+/**
+ * Template Name: Sidebar Template
+ * Description: A Page Template that adds a sidebar to pages
+ *
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ * @since Twenty Eleven 1.0
+ */
+
+get_header(); ?>
+
+ <div id="primary">
+ <div id="content" role="main">
+
+ <?php the_post(); ?>
+
+ <?php get_template_part( 'content', 'page' ); ?>
+
+ <?php comments_template( '', true ); ?>
+
+ </div><!-- #content -->
+ </div><!-- #primary -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/style.css (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/style.css 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/style.css 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -1052,6 +1052,9 @@
</span><span class="cx"> .format-image .entry-meta span.comments-link {
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><ins>+.format-image footer.entry-meta a {
+ color: #444;
+}
</ins><span class="cx"> .format-image .wp-caption {
</span><span class="cx"> background: #111;
</span><span class="cx"> margin-bottom: 0;
</span><span class="lines">@@ -1779,6 +1782,18 @@
</span><span class="cx"> border-color: #d3d3d3;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* sidebar-page.php comments */
+/* Make sure we have room for our comment avatars */
+.page-template-sidebar-page-php .commentlist > li.comment,
+.page-template-sidebar-page-php.commentlist .pingback {
+ margin-left: 102px;
+ width: auto;
+}
+/* And a full-width comment form */
+.page-template-sidebar-page-php #respond {
+ width: auto;
+}
+
</ins><span class="cx"> /* Comment Form */
</span><span class="cx"> #respond {
</span><span class="cx"> background: #ddd;
</span><span class="lines">@@ -2114,7 +2129,7 @@
</span><span class="cx"> /* Talking avatars take up too much room at this size */
</span><span class="cx"> .commentlist > li.comment,
</span><span class="cx"> .commentlist > li.pingback {
</span><del>- margin-left: 0;
</del><ins>+ margin-left: 0 !important;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist .avatar {
</span><span class="cx"> background: transparent;
</span><span class="lines">@@ -2146,9 +2161,7 @@
</span><span class="cx"> font-size: 10pt;
</span><span class="cx"> }
</span><span class="cx"> footer.entry-meta a[rel=bookmark]:link:after,
</span><del>- footer.entry-meta a[rel=bookmark]:visited:after,
- #author-info a:link:after,
- #author-info a:visited:after {
</del><ins>+ footer.entry-meta a[rel=bookmark]:visited:after {
</ins><span class="cx"> content:" [" attr(href) "] "; /* Show URLs */
</span><span class="cx"> }
</span><span class="cx"> #page {
</span><span class="lines">@@ -2200,6 +2213,9 @@
</span><span class="cx"> .singular .entry-header .entry-meta {
</span><span class="cx"> position: static;
</span><span class="cx"> }
</span><ins>+ .entry-meta .edit-link a {
+ display: none;
+ }
</ins><span class="cx"> #content nav {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -2270,6 +2286,16 @@
</span><span class="cx"> .commentlist li.comment .comment-content {
</span><span class="cx"> margin: 1.625em 0 0;
</span><span class="cx"> }
</span><ins>+ .commentlist .comment-edit-link {
+ display: none;
+ }
+ .commentlist > li::before,
+ .commentlist > li.bypostauthor::before {
+ content: '';
+ }
+ .commentlist .reply {
+ display: none;
+ }
</ins><span class="cx">
</span><span class="cx"> /* Post author highlighting */
</span><span class="cx"> .commentlist > li.bypostauthor {
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyeleventagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/tag.php (17801 => 17802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/tag.php 2011-05-04 20:22:44 UTC (rev 17801)
+++ trunk/wp-content/themes/twentyeleven/tag.php 2011-05-04 22:54:50 UTC (rev 17802)
</span><span class="lines">@@ -27,7 +27,13 @@
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <?php get_template_part( 'content', get_post_format() ); ?>
</del><ins>+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called loop-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>