<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14786] trunk/wp-content/themes/twentyten: In Twenty Ten,
final pass on inline docs et al.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14786">14786</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-21 18:56:27 +0000 (Fri, 21 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>In Twenty Ten, final pass on inline docs et al. props jorbin, zeo. fixes <a href="http://trac.wordpress.org/ticket/12695">#12695</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenauthorphp">trunk/wp-content/themes/twentyten/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentyteneditorstylertlcss">trunk/wp-content/themes/twentyten/editor-style-rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentyteneditorstylecss">trunk/wp-content/themes/twentyten/editor-style.css</a></li>
<li><a href="#trunkwpcontentthemestwentytenfooterphp">trunk/wp-content/themes/twentyten/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> $metadata['height']
</span><span class="cx"> )
</span><span class="cx"> );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
</span><span class="cx"> <?php endif; ?>
</span><del>- </div>
</del><ins>+ </div><!-- .entry-attachment -->
</ins><span class="cx"> <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
</span><span class="cx">
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/author.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><span class="cx"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><del>- </div><!-- #author-avatar -->
</del><ins>+ </div><!-- #author-avatar -->
</ins><span class="cx"> <div id="author-description">
</span><span class="cx"> <h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
</span><span class="cx"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx"> </div><!-- #author-description -->
</span><del>- </div><!-- .entry-author-info -->
</del><ins>+ </div><!-- #entry-author-info -->
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> <div id="comments">
</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.', 'twentyten' ); ?></div>
</span><del>- </div><!-- .comments -->
</del><ins>+ </div><!-- #comments -->
</ins><span class="cx"> <?php
</span><span class="cx"> /* Stop the rest of comments.php from being processed,
</span><span class="cx"> * but don't kill the script entirely -- we still have
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> <div class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
</span><del>- </div>
</del><ins>+ </div> <!-- .navigation -->
</ins><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <div class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
</span><del>- </div>
</del><ins>+ </div><!-- .navigation -->
</ins><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span><span class="cx"> <?php else : // or, if we don't have comments:
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> if ( ! comments_open() ) :
</span><span class="cx"> ?>
</span><span class="cx"> <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
</span><del>-<?php endif; // end ! comments_opened() ?>
</del><ins>+<?php endif; // end ! comments_open() ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; // end have_comments() ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyteneditorstylertlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/editor-style-rtl.css (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/editor-style-rtl.css 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/editor-style-rtl.css 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+/*
+Theme Name: Twenty Ten
+*/
+/*
+Used to style the TinyMCE editor.
+*/
</ins><span class="cx"> html .mceContentBody{
</span><span class="cx"> direction:rtl;
</span><span class="cx"> unicode-bidi:embed;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyteneditorstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/editor-style.css (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/editor-style.css 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/editor-style.css 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+/*
+Theme Name: Twenty Ten
+*/
+/*
+Used to style the TinyMCE editor.
+*/
</ins><span class="cx"> html .mceContentBody {
</span><span class="cx"> max-width:640px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> <a href="<?php echo home_url( '/' ) ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
</span><span class="cx"> <?php bloginfo( 'name' ); ?>
</span><span class="cx"> </a>
</span><del>- </div>
</del><ins>+ </div><!-- #site-info -->
</ins><span class="cx">
</span><span class="cx"> <div id="site-generator">
</span><span class="cx"> <?php do_action( 'twentyten_credits' ); ?>
</span><span class="lines">@@ -34,14 +34,20 @@
</span><span class="cx"> title="<?php esc_attr_e('Semantic Personal Publishing Platform', 'twentyten'); ?>" rel="generator">
</span><span class="cx"> <?php printf( __('Proudly powered by %s.', 'twentyten'), 'WordPress' ); ?>
</span><span class="cx"> </a>
</span><del>- </div>
</del><ins>+ </div><!-- #site-generator -->
</ins><span class="cx">
</span><span class="cx"> </div><!-- #colophon -->
</span><span class="cx"> </div><!-- #footer -->
</span><span class="cx">
</span><span class="cx"> </div><!-- #wrapper -->
</span><span class="cx">
</span><del>-<?php wp_footer(); ?>
</del><ins>+<?php
+ /* Always have wp_footer() just before the closing </body>
+ * tag of your theme, or you will break many plugins, which
+ * generally use this hook to reference JavaScript files.
+ */
</ins><span class="cx">
</span><ins>+ wp_footer();
+?>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> * }
</span><span class="cx"> * </code>
</span><span class="cx"> *
</span><del>- * For more information on hooks, see http://codex.wordpress.org/Plugin_API.
</del><ins>+ * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Ten
</span><span class="lines">@@ -110,7 +110,8 @@
</span><span class="cx"> define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
</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 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit).
</del><ins>+ // We want them to be 940 pixels wide by 198 pixels tall.
+ // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
</ins><span class="cx"> set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
</span><span class="cx">
</span><span class="cx"> // Don't support text inside the header image.
</span><span class="lines">@@ -133,43 +134,43 @@
</span><span class="cx"> 'cherryblossom' => array(
</span><span class="cx"> 'url' => '%s/images/headers/cherryblossoms.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Cherry Blossoms', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'concave' => array(
</span><span class="cx"> 'url' => '%s/images/headers/concave.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Concave', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'fern' => array(
</span><span class="cx"> 'url' => '%s/images/headers/fern.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Fern', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'forestfloor' => array(
</span><span class="cx"> 'url' => '%s/images/headers/forestfloor.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Forest Floor', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'inkwell' => array(
</span><span class="cx"> 'url' => '%s/images/headers/inkwell.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Inkwell', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'path' => array(
</span><span class="cx"> 'url' => '%s/images/headers/path.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Path', 'twentyten' )
</span><span class="cx"> ),
</span><span class="cx"> 'sunset' => array(
</span><span class="cx"> 'url' => '%s/images/headers/sunset.jpg',
</span><span class="cx"> 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
</span><del>- /* translators: header image description */
</del><ins>+ /* translators: header image description */
</ins><span class="cx"> 'description' => __( 'Sunset', 'twentyten' )
</span><span class="cx"> )
</span><span class="cx"> ) );
</span><span class="lines">@@ -288,7 +289,7 @@
</span><span class="cx"> <div class="comment-author vcard">
</span><span class="cx"> <?php echo get_avatar( $comment, 40 ); ?>
</span><span class="cx"> <?php printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</span><del>- </div>
</del><ins>+ </div><!-- .comment-author .vcard -->
</ins><span class="cx"> <?php if ( $comment->comment_approved == '0' ) : ?>
</span><span class="cx"> <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
</span><span class="cx"> <br />
</span><span class="lines">@@ -299,14 +300,14 @@
</span><span class="cx"> /* translators: 1: date, 2: time */
</span><span class="cx"> printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
</span><span class="cx"> ?>
</span><del>- </div>
</del><ins>+ </div><!-- .comment-meta .commentmetadata -->
</ins><span class="cx">
</span><span class="cx"> <div class="comment-body"><?php comment_text(); ?></div>
</span><span class="cx">
</span><span class="cx"> <div class="reply">
</span><span class="cx"> <?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
</span><del>- </div>
- </div>
</del><ins>+ </div><!-- .reply -->
+ </div><!-- #comment-## -->
</ins><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <li class="post pingback">
</span><span class="lines">@@ -325,7 +326,7 @@
</span><span class="cx"> * @uses register_sidebar
</span><span class="cx"> */
</span><span class="cx"> function twentyten_widgets_init() {
</span><del>- // Area 1
</del><ins>+ // Area 1, located at the top of the sidebar.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Primary Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'primary-widget-area',
</span><span class="lines">@@ -336,7 +337,7 @@
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Area 2
</del><ins>+ // Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Secondary Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'secondary-widget-area',
</span><span class="lines">@@ -347,7 +348,7 @@
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Area 3
</del><ins>+ // Area 3, located in the footer. Empty by default.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'First Footer Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'first-footer-widget-area',
</span><span class="lines">@@ -358,7 +359,7 @@
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Area 4
</del><ins>+ // Area 4, located in the footer. Empty by default.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Second Footer Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'second-footer-widget-area',
</span><span class="lines">@@ -369,7 +370,7 @@
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Area 5
</del><ins>+ // Area 5, located in the footer. Empty by default.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Third Footer Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'third-footer-widget-area',
</span><span class="lines">@@ -380,7 +381,7 @@
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Area 6
</del><ins>+ // Area 6, located in the footer. Empty by default.
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
</span><span class="cx"> 'id' => 'fourth-footer-widget-area',
</span><span class="lines">@@ -422,13 +423,12 @@
</span><span class="cx"> esc_attr( get_the_time() ),
</span><span class="cx"> get_the_date()
</span><span class="cx"> ),
</span><del>- sprintf( '</span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</del><ins>+ sprintf( '</span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</ins><span class="cx"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><span class="cx"> sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
</span><span class="cx"> get_the_author()
</span><span class="cx"> )
</span><span class="cx"> );
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="lines">@@ -453,6 +453,6 @@
</span><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute( 'echo=0' )
</span><del>- );
</del><ins>+ );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/header.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -13,30 +13,44 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><span class="cx"> <title>
</span><del>- <?php
- if ( is_single() ) {
</del><ins>+ <?php // Returns the title based on what is being viewed
+ if ( is_single() ) { // single posts
</ins><span class="cx"> single_post_title(); echo ' | '; bloginfo( 'name' );
</span><ins>+ // The home page or, if using a static front page, the blog posts page.
</ins><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><del>- bloginfo( 'name' );
- if( get_bloginfo( 'description' ) )
- echo ' | ' ; bloginfo( 'description' );
</del><ins>+ bloginfo( 'name' );
+ if( get_bloginfo( 'description' ) )
+ echo ' | ' ; bloginfo( 'description' );
</ins><span class="cx"> twentyten_the_page_number();
</span><del>- } elseif ( is_page() ) {
</del><ins>+ } elseif ( is_page() ) { // WordPress Pages
</ins><span class="cx"> single_post_title( '' ); echo ' | '; bloginfo( 'name' );
</span><del>- } elseif ( is_search() ) {
</del><ins>+ } elseif ( is_search() ) { // Search results
</ins><span class="cx"> printf( __( 'Search results for %s', 'twentyten' ), '"'.get_search_query().'"' ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</span><del>- } elseif ( is_404() ) {
</del><ins>+ } elseif ( is_404() ) { // 404 (Not Found)
</ins><span class="cx"> _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
</span><del>- } else {
</del><ins>+ } else { // Otherwise:
</ins><span class="cx"> wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
</span><span class="cx"> }
</span><span class="cx"> ?>
</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><del>- <?php wp_head(); ?>
</del><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' );
+
+ /* 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">@@ -66,7 +80,9 @@
</span><span class="cx"> </div><!-- #branding -->
</span><span class="cx">
</span><span class="cx"> <div id="access" role="navigation">
</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', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
</span><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( 'sort_column' => 'menu_order', 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </div><!-- #access -->
</span><span class="cx"> </div><!-- #masthead -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx"> * http://codex.wordpress.org/Template_Tags to understand
</span><span class="cx"> * the tags used in it.
</span><span class="cx"> *
</span><ins>+ * This can be overridden in child themes with loop.php or
+ * loop-template.php, where 'template' is the loop context
+ * requested by a template. For example, loop-index.php would
+ * be used if it exists and we ask for the loop with:
+ * <code>get_template_part( 'loop', 'index' );</code>
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Ten
</span><span class="cx"> * @since Twenty Ten 1.0
</span><span class="lines">@@ -68,7 +74,7 @@
</span><span class="cx"> $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
</span><span class="cx"> ?>
</span><span class="cx"> <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
</span><del>- </div>
</del><ins>+ </div><!-- .gallery-thumb -->
</ins><span class="cx"> <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
</span><span class="cx"> 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
</span><span class="cx"> $total_images
</span><span class="lines">@@ -82,8 +88,8 @@
</span><span class="cx"> <span class="meta-sep">|</span>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><del>- </div><!-- #entry-utility -->
- </div>
</del><ins>+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
</ins><span class="cx">
</span><span class="cx"> <?php /* How to display posts in the asides category */ ?>
</span><span class="cx">
</span><span class="lines">@@ -105,8 +111,8 @@
</span><span class="cx"> <span class="meta-sep">|</span>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><del>- </div><!-- #entry-utility -->
- </div><!-- #post-(id) -->
</del><ins>+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
</ins><span class="cx">
</span><span class="cx"> <?php /* How to display all other posts. */ ?>
</span><span class="cx">
</span><span class="lines">@@ -147,7 +153,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- .entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="cx"> <?php comments_template( '', true ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/search.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
</span><span class="cx"> <?php get_search_form(); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><del>- </div>
</del><ins>+ </div><!-- #post-0 -->
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (14785 => 14786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-05-21 18:19:56 UTC (rev 14785)
+++ trunk/wp-content/themes/twentyten/single.php 2010-05-21 18:56:27 UTC (rev 14786)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> </a>
</span><span class="cx"> </div><!-- #author-link -->
</span><span class="cx"> </div><!-- #author-description -->
</span><del>- </div><!-- .entry-author-info -->
</del><ins>+ </div><!-- #entry-author-info -->
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <?php twentyten_posted_in(); ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-utility -->
</span><del>- </div><!-- #post-(id) -->
</del><ins>+ </div><!-- #post-## -->
</ins><span class="cx">
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
</span></span></pre>
</div>
</div>
</body>
</html>