<!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>[18269] trunk/wp-content/themes/twentyeleven/showcase.php: Showcase template cleanup.</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/18269">18269</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-06-11 05:07:18 +0000 (Sat, 11 Jun 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Showcase template cleanup. See <a href="http://trac.wordpress.org/ticket/17748">#17748</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenshowcasephp">trunk/wp-content/themes/twentyeleven/showcase.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/showcase.php (18268 => 18269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/showcase.php        2011-06-11 04:40:18 UTC (rev 18268)
+++ trunk/wp-content/themes/twentyeleven/showcase.php        2011-06-11 05:07:18 UTC (rev 18269)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> 
</span><span class="cx">                                         /**
</span><span class="cx">                                          * We're going to add a class to our featured post for featured images
</span><del>-                                         * by default it'll have no class though.
</del><ins>+                                         * by default it'll have the feature-text class.
</ins><span class="cx">                                          */
</span><del>-                                        $feature_class = '';
</del><ins>+                                        $feature_class = 'feature-text';
</ins><span class="cx"> 
</span><span class="cx">                                         if ( has_post_thumbnail() ) {
</span><span class="cx">                                                 // ... but if it has a featured image let's add some class
</span><span class="lines">@@ -94,32 +94,28 @@
</span><span class="cx">                                                         // If bigger, let's add a BIGGER class. It's EXTRA classy now.
</span><span class="cx">                                                         $feature_class = 'feature-image large';
</span><span class="cx">                                                 }
</span><del>-                                        } else {
-                                                $feature_class = 'feature-text';
</del><span class="cx">                                         }
</span><del>-                                ?&gt;
-
-                                &lt;?php if ( has_post_thumbnail() ) : ?&gt;
-                                &lt;section class=&quot;featured-post &lt;?php echo $feature_class; ?&gt;&quot; id=&quot;featured-post-&lt;?php echo $counter_slider; ?&gt;&quot;&gt;
-                                &lt;?php else : ?&gt;
-                                &lt;section class=&quot;featured-post&quot; id=&quot;featured-post-&lt;?php echo $counter_slider; ?&gt;&quot;&gt;
-                                &lt;?php endif; ?&gt;
-
-                                        &lt;?php
-                                                /**
-                                                 * If the thumbnail is as big as the header image
-                                                 * make it a large featured post, otherwise render it small
-                                                 */
-                                                if ( has_post_thumbnail() ) {
-                                                        if ( $image[1] &gt;= HEADER_IMAGE_WIDTH ) { ?&gt;
-                                                                &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt; &lt;?php the_post_thumbnail( 'large-feature' ); ?&gt;&lt;/a&gt;
-                                                        &lt;?php } else { ?&gt;
-                                                                &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_post_thumbnail( 'small-feature' ); ?&gt;&lt;/a&gt;
-                                                        &lt;?php }
-                                                }
</del><span class="cx">                                         ?&gt;
</span><del>-                                        &lt;?php get_template_part( 'content', 'featured' ); ?&gt;
-                                &lt;/section&gt;
</del><ins>+
+                                        &lt;section class=&quot;featured-post &lt;?php echo $feature_class; ?&gt;&quot; id=&quot;featured-post-&lt;?php echo $counter_slider; ?&gt;&quot;&gt;
+        
+                                                &lt;?php
+                                                        /**
+                                                         * If the thumbnail is as big as the header image
+                                                         * make it a large featured post, otherwise render it small
+                                                         */
+                                                        if ( has_post_thumbnail() ) {
+                                                                if ( $image[1] &gt;= HEADER_IMAGE_WIDTH )
+                                                                        $thumbnail_size = 'large-feature';
+                                                                else
+                                                                        $thumbnail_size = 'small-feature';
+                                                                ?&gt;
+                                                                &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_post_thumbnail( $thumbnail_size ); ?&gt;&lt;/a&gt;
+                                                                &lt;?php
+                                                        }
+                                                ?&gt;
+                                                &lt;?php get_template_part( 'content', 'featured' ); ?&gt;
+                                        &lt;/section&gt;
</ins><span class="cx">                                 &lt;?php endwhile;        ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php
</span><span class="lines">@@ -129,11 +125,6 @@
</span><span class="cx">                                 &lt;nav class=&quot;feature-slider&quot;&gt;
</span><span class="cx">                                         &lt;ul&gt;
</span><span class="cx">                                         &lt;?php
</span><del>-                                                /**
-                                                 * We need to query the same set of posts again
-                                                 * to populate the navigation dots
-                                                 */
-                                            $featured-&gt;query( $featured_args );
</del><span class="cx"> 
</span><span class="cx">                                                 // Reset the counter so that we end up with matching elements
</span><span class="cx">                                             $counter_slider = 0;
</span><span class="lines">@@ -144,12 +135,12 @@
</span><span class="cx">                                                 // Let's roll again.
</span><span class="cx">                                             while ( $featured-&gt;have_posts() ) : $featured-&gt;the_post();
</span><span class="cx">                                                     $counter_slider++;
</span><del>-                                    ?&gt;
-                                                &lt;li&gt;&lt;a href=&quot;#featured-post-&lt;?php echo $counter_slider; ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; &lt;?php
-                                                if ( 1 == $counter_slider ) :
-                                                        echo 'class=&quot;active&quot;';
-                                                endif;
-                                                ?&gt;&gt;&lt;/a&gt;&lt;/li&gt;
</del><ins>+                                                        if ( 1 == $counter_slider )
+                                                                $class = 'class=&quot;active&quot;';
+                                                        else
+                                                                $class = '';
+                                            ?&gt;
+                                                &lt;li&gt;&lt;a href=&quot;#featured-post-&lt;?php echo $counter_slider; ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; &lt;?php echo $class; ?&gt;&gt;&lt;/a&gt;&lt;/li&gt;
</ins><span class="cx">                                         &lt;?php endwhile;        ?&gt;
</span><span class="cx">                                         &lt;/ul&gt;
</span><span class="cx">                                 &lt;/nav&gt;
</span><span class="lines">@@ -177,33 +168,40 @@
</span><span class="cx">                                                 ),
</span><span class="cx">                                                 'no_found_rows' =&gt; true,
</span><span class="cx">                                         );
</span><ins>+
</ins><span class="cx">                                         // Our new query for the Recent Posts section.
</span><span class="cx">                                         $recent = new WP_Query( $recent_args );
</span><del>-                                        $counter = 0;
</del><span class="cx"> 
</span><del>-                                        while ( $recent-&gt;have_posts() ) : $recent-&gt;the_post();
</del><ins>+                                        // The first Recent post is displayed normally
+                                        if ( $recent-&gt;have_posts() ) : $recent-&gt;the_post();
+
</ins><span class="cx">                                                 // Set $more to 0 in order to only get the first part of the post.
</span><span class="cx">                                                 global $more;
</span><span class="cx">                                                 $more = 0;
</span><del>-                                                $counter++;
</del><span class="cx"> 
</span><del>-                                                if ( 1 == $counter ) :
-                                                        get_template_part( 'content', get_post_format() );
-                                                        echo '&lt;ol class=&quot;other-recent-posts&quot;&gt;';
</del><ins>+                                                get_template_part( 'content', get_post_format() );
</ins><span class="cx"> 
</span><del>-                                                else : ?&gt;
-                                                        &lt;li class=&quot;entry-title&quot;&gt;
-                                                                &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;
-                                                                &lt;span class=&quot;comments-link&quot;&gt;
-                                                                        &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Leave a reply&lt;/span&gt;', 'twentyeleven' ), __( '&lt;b&gt;1&lt;/b&gt; Reply', 'twentyeleven' ), __( '&lt;b&gt;%&lt;/b&gt; Replies', 'twentyeleven' ) ); ?&gt;
-                                                                &lt;/span&gt;
-                                                        &lt;/li&gt;
</del><ins>+                                                echo '&lt;ol class=&quot;other-recent-posts&quot;&gt;';
</ins><span class="cx"> 
</span><del>-                                                &lt;?php endif;
</del><ins>+                                        endif;
+
+                                        // For all other recent posts, just display the title and comment status.
+                                        while ( $recent-&gt;have_posts() ) : $recent-&gt;the_post(); ?&gt;
+
+                                                &lt;li class=&quot;entry-title&quot;&gt;
+                                                        &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;
+                                                        &lt;span class=&quot;comments-link&quot;&gt;
+                                                                &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Leave a reply&lt;/span&gt;', 'twentyeleven' ), __( '&lt;b&gt;1&lt;/b&gt; Reply', 'twentyeleven' ), __( '&lt;b&gt;%&lt;/b&gt; Replies', 'twentyeleven' ) ); ?&gt;
+                                                        &lt;/span&gt;
+                                                &lt;/li&gt;
+
+                                        &lt;?php
</ins><span class="cx">                                         endwhile;
</span><del>-                                        ?&gt;
</del><span class="cx"> 
</span><del>-                                        &lt;/ol&gt;
</del><ins>+                                        // If we had some posts, close the &lt;ol&gt;
+                                        if ( $recent-&gt;post_count &gt; 0 )
+                                                echo '&lt;/ol&gt;';
+                                        ?&gt;
</ins><span class="cx">                                 &lt;/section&gt;&lt;!-- .recent-posts --&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;div class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span></span></pre>
</div>
</div>

</body>
</html>