WordPress.org

Make WordPress Core

Changeset 13128


Ignore:
Timestamp:
02/14/2010 01:00:22 AM (8 years ago)
Author:
dd32
Message:

Formatting, Translations & Whitespace. Props ptahdunbar. See #9015

Location:
trunk/wp-content/themes/twentyten
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-content/themes/twentyten/404.php

    r13025 r13128  
    55
    66            <div id="post-0" class="post error404 not-found">
    7                 <h1 class="entry-title">Not Found</h1>
     7                <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
    88                <div class="entry-content">
    9                     <p>Apologies, but the page you requested could not be found. Perhaps searching will help.</p>
     9                    <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
    1010                    <?php get_search_form(); ?>
    1111                </div><!-- .entry-content -->
  • trunk/wp-content/themes/twentyten/archive.php

    r13111 r13128  
    77
    88<?php if ( is_day() ) : ?>
    9                 <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ) ?></h1>
     9                <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?></h1>
    1010<?php elseif ( is_month() ) : ?>
    11                 <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ) ?></h1>
     11                <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
    1212<?php elseif ( is_year() ) : ?>
    13                 <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ) ?></h1>
     13                <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
    1414<?php elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) : ?>
    15                 <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ) ?></h1>
     15                <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
    1616<?php endif; ?>
    1717
     
    2020<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    2121                <div id="nav-above" class="navigation">
    22                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    23                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     22                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     23                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    2424                </div><!-- #nav-above -->
    2525<?php } ?>
     
    3232                    <div class="entry-meta">
    3333                        <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    34                         <a href="<?php
    35         the_permalink(); ?>" title="<?php echo esc_attr( get_the_time('Y-m-d\TH:i:sO') ); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    36                         <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    37                         <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     34                        <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( get_the_time() ); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     35                        <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
     36                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    3837                    </div><!-- .entry-meta -->
    3938
     
    4443                    <div class="entry-utility">
    4544                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
    46                         <span class="meta-sep"> | </span>
    47                         <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
    48                         <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    49                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     45                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
     46                        <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
     47                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     48                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    5049                    </div><!-- #entry-utility -->
    5150                </div><!-- #post-<?php the_ID(); ?> -->
     
    5554<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    5655                <div id="nav-below" class="navigation">
    57                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    58                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     56                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     57                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    5958                </div><!-- #nav-below -->
    6059<?php } ?>
  • trunk/wp-content/themes/twentyten/attachment.php

    r13111 r13128  
    66<?php the_post(); ?>
    77
    8                 <p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent) ?></a></p>
     8                <p class="page-title"><a href="<?php echo get_permalink($post->post_parent); ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ); ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent); ?></a></p>
    99
    1010                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     
    1212
    1313                    <div class="entry-meta">
    14                         <span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span>
     14                        <span class="meta-prep meta-prep-author"><?php _e( 'By ', 'twentyten' ); ?></span>
    1515                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
    16                         <span class="meta-sep"> | </span>
    17                         <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
    18                         <span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php echo get_the_date(); ?></abbr></span>
    19                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
     16                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
     17                        <span class="meta-prep meta-prep-entry-date"><?php _e( 'Published ', 'twentyten' ); ?></span>
     18                        <span class="entry-date"><abbr class="published" title="<?php the_time() ?>"><?php echo get_the_date(); ?></abbr></span>
     19                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
    2020                    </div><!-- .entry-meta -->
    2121
     
    3333                </div><!-- #nav-below -->
    3434<?php else : ?>
    35                         <a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename(get_permalink()) ?></a>
     35                        <a href="<?php echo wp_get_attachment_url($post->ID); ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename(get_permalink()); ?></a>
    3636<?php endif; ?>
    3737                        </div>
    38                         <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
     38                        <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); ?></div>
    3939
    40 <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
    41 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
     40                        <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
     41                        <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
    4242
    4343                    </div><!-- .entry-content -->
     
    4949                        get_permalink(),
    5050                        the_title_attribute('echo=0'),
    51                         get_post_comments_feed_link() ) ?>
     51                        get_post_comments_feed_link() ); ?>
    5252
    5353<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
    54                         <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
     54                        <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
    5555<?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?>
    56                         <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
     56                        <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
    5757<?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?>
    58                         <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ) ?>
     58                        <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
    5959<?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>
    60                         <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ) ?>
     60                        <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
    6161<?php endif; ?>
    62 <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
     62<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
    6363                    </div><!-- .entry-utility -->
    6464                </div><!-- #post-<?php the_ID(); ?> -->
  • trunk/wp-content/themes/twentyten/author.php

    r13111 r13128  
    66<?php the_post(); ?>
    77
    8                 <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr($authordata->display_name) . "' rel='me'>" . esc_html($authordata->display_name) . "</a>" ) ?></h1>
     8                <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr($authordata->display_name) . "' rel='me'>" . esc_html($authordata->display_name) . "</a>" ); ?></h1>
    99
    1010<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries  ?>
    1111                    <div id="entry-author-info">
    1212                        <div id="author-avatar">
    13 <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
     13                            <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
    1414                        </div><!-- #author-avatar   -->
    1515                        <div id="author-description">
    1616                            <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
    17 <?php the_author_meta('description'); ?>
     17                            <?php the_author_meta('description'); ?>
    1818                        </div><!-- #author-description  -->
    1919                    </div><!-- .entry-author-info -->
     
    2424<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    2525                <div id="nav-above" class="navigation">
    26                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    27                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     26                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     27                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    2828                </div><!-- #nav-above -->
    2929<?php } ?>
     
    3535
    3636                    <div class="entry-meta">
    37                         <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    38                         <a href="<?php
    39         the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     37                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     38                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    4039                    </div><!-- .entry-meta -->
    4140
    4241                    <div class="entry-summary">
    43 <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
     42                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
    4443                    </div><!-- .entry-summary -->
    4544
    4645                    <div class="entry-utility">
    47                         <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
     46                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
    4847                        <span class="meta-sep"> | </span>
    49                         <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
    50                         <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    51                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     48                        <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
     49                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     50                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    5251                    </div><!-- #entry-utility -->
    5352                </div><!-- #post-<?php the_ID(); ?> -->
     
    5756<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    5857                <div id="nav-below" class="navigation">
    59                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    60                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     58                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     59                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    6160                </div><!-- #nav-below -->
    6261<?php } ?>
  • trunk/wp-content/themes/twentyten/category.php

    r13111 r13128  
    1 
    21<?php get_header(); ?>
    32
     
    76<?php the_post(); ?>
    87
    9                 <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1>
     8                <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
    109                <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
    1110
     
    1413<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    1514                <div id="nav-above" class="navigation">
    16                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    17                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     15                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     16                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    1817                </div><!-- #nav-above -->
    1918<?php } ?>
     
    2524
    2625                    <div class="entry-meta">
    27                         <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    28                         <a href="<?php
    29         the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    30                         <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    31                         <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     26                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     27                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     28                        <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
     29                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    3230                    </div><!-- .entry-meta -->
    3331
    3432                    <div class="entry-summary">
    35 <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
     33                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
    3634                    </div><!-- .entry-summary -->
    3735
    3836                    <div class="entry-utility">
    39 <?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?>
    40                         <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span>
    41                         <span class="meta-sep"> | </span>
     37<?php if ( $cats_meow = cats_meow( ', ' ) ) : // Returns categories other than the one queried ?>
     38                        <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ); ?></span>
     39                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
    4240<?php endif ?>
    43                         <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
    44                         <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    45                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     41                        <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
     42                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     43                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    4644                    </div><!-- #entry-utility -->
    4745                </div><!-- #post-<?php the_ID(); ?> -->
     
    5149<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    5250                <div id="nav-below" class="navigation">
    53                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    54                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     51                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     52                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    5553                </div><!-- #nav-below -->
    5654<?php } ?>
  • trunk/wp-content/themes/twentyten/comments.php

    r13031 r13128  
    22<?php
    33    // Do not delete these lines
    4     $req = get_option('require_name_email'); // Checks if fields are required.
     4    $req = get_option( 'require_name_email' ); // Checks if fields are required.
    55    if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
    6         die ( 'Please do not load this page directly. Thanks!' );
     6        die ( __( 'Please do not load this page directly. Thanks!', 'twentyten' ) );
    77    if ( post_password_required() ) :
    88?>
    9                 <div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyten') ?></div>
     9                <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
    1010            </div><!-- .comments -->
    1111<?php
     
    2323<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
    2424            <div class="navigation">
    25                 <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
    26                 <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
     25                <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
     26                <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
    2727            </div>
    2828<?php endif; // check for comment navigation ?>
    2929
    3030            <ol class="commentlist">
    31             <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
     31                <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
    3232            </ol>
    3333
    3434<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
    3535            <div class="navigation">
    36                 <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
    37                 <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
     36                <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
     37                <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
    3838            </div>
    3939<?php endif; // check for comment navigation ?>
  • trunk/wp-content/themes/twentyten/footer.php

    r13029 r13128  
    44        <div id="colophon">
    55
    6 <?php get_sidebar('footer'); ?>
     6<?php get_sidebar( 'footer' ); ?>
    77
    88            <div id="site-info">
    9                 <a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a>
     9                <a href="<?php home_url() ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
    1010            </div>
    1111
  • trunk/wp-content/themes/twentyten/functions.php

    r13112 r13128  
    22
    33// Set the content width based on the Theme CSS
    4 $content_width = apply_filters('twentyten_content_width', 640 );
     4$content_width = apply_filters( 'twentyten_content_width', 640 );
    55
    66// Your Changeable header business starts here
     
    2626}
    2727
    28 add_custom_image_header('', 'twentyten_admin_header_style');
     28add_custom_image_header( '', 'twentyten_admin_header_style' );
    2929// and thus ends the changeable header business
    3030
     
    4545$locale_file = TEMPLATEPATH . "/languages/$locale.php";
    4646if ( is_readable($locale_file) )
    47     require_once($locale_file);
     47    require_once( $locale_file );
    4848
    4949// Get the page number
    50 function get_page_number() {
     50function twentyten_get_page_number() {
    5151    if ( get_query_var('paged') )
    52         echo ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
     52        echo ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');
    5353}
    5454
    5555// Control excerpt length
    56 function new_excerpt_length($length) {
     56function twentyten_new_excerpt_length( $length ) {
    5757    return 40;
    5858}
    59 add_filter('excerpt_length', 'new_excerpt_length');
     59add_filter( 'excerpt_length', 'twentyten_new_excerpt_length' );
    6060
    6161
    6262// Make a nice read more link on excerpts
    63 function new_excerpt_more($more) {
     63function twentyten_new_excerpt_more($more) {
    6464    return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
    6565}
    66 add_filter('excerpt_more', 'new_excerpt_more');
     66add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' );
    6767
    6868
    6969// Template for comments and pingbacks
    70 function twentyten_comment($comment, $args, $depth) {
    71     $GLOBALS ['comment'] = $comment; ?>
    72     <?php if ('' == $comment->comment_type) { ?>
    73     <li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
     70function twentyten_list_comment( $comment, $args, $depth ) {
     71    $GLOBALS['comment'] = $comment; ?>
     72    <?php if ( '' == $comment->comment_type ) { ?>
     73    <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
    7474        <div id="comment-<?php comment_ID(); ?>">
    7575        <div class="comment-author vcard">
    76             <?php echo get_avatar($comment, 40); ?>
    77 
    78             <?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?>
     76            <?php echo get_avatar( $comment, 40 ); ?>
     77            <?php printf( __('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link() ); ?>
    7978        </div>
    80         <?php if ($comment->comment_approved == '0') : ?>
    81             <em><?php _e('Your comment is awaiting moderation.') ?></em>
     79        <?php if ( $comment->comment_approved == '0' ) : ?>
     80            <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
    8281            <br />
    8382        <?php endif; ?>
    8483
    85         <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'  ','') ?></div>
    86 
    87         <div class="comment-body"><?php comment_text() ?></div>
     84        <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()); ?></a><?php edit_comment_link(__('(Edit)', 'twentyten'),'  ',''); ?></div>
     85
     86        <div class="comment-body"><?php comment_text(); ?></div>
    8887
    8988        <div class="reply">
    90             <?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
     89            <?php comment_reply_link( array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth'])) ); ?>
    9190        </div>
    9291    </div>
     
    9493    <?php } else { ?>
    9594    <li class="post pingback">
    96         <p><?php _e('Pingback:') ?> <?php comment_author_link ()?><?php edit_comment_link ( 'edit', '&nbsp;&nbsp;', '' ); ?></p>
     95        <p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
    9796    <?php }
    9897}
    9998
    10099// Make the Visual Editor styles match the theme's styles
    101 function my_editor_style($url) {
    102     if ( !empty($url) )
    103         $url .= ',';
    104 
     100function twentyten_my_editor_style( $url ) {
     101        if ( !empty($url) )
     102            $url .= ',';
    105103    // Change the path here if using sub-directory
    106104    $url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';
     
    108106    return $url;
    109107}
    110 add_filter('mce_css', 'my_editor_style');
     108add_filter( 'mce_css', 'twentyten_my_editor_style' );
     109
    111110
    112111// Remove inline styles on gallery shortcode
    113 function remove_gallery_css() {
     112function twentyten_remove_gallery_css() {
    114113    return "<div class='gallery'>";
    115114}
    116 add_filter('gallery_style', 'remove_gallery_css');
     115add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
     116
    117117
    118118// For category lists on category archives: Returns other categories except the current one (redundant)
    119 function cats_meow($glue) {
     119function cats_meow( $glue ) {
    120120    $current_cat = single_cat_title( '', false );
    121121    $separator = "\n";
     
    123123    foreach ( $cats as $i => $str ) {
    124124        if ( strstr( $str, ">$current_cat<" ) ) {
    125             unset($cats[$i]);
     125            unset( $cats[$i] );
    126126            break;
    127127        }
     
    130130        return false;
    131131
    132     return trim(join( $glue, $cats ));
     132    return trim( join( $glue, $cats ) );
    133133} // end cats_meow
    134134
     135
    135136// For tag lists on tag archives: Returns other tags except the current one (redundant)
    136 function tag_ur_it($glue) {
     137function tag_ur_it( $glue ) {
    137138    $current_tag = single_tag_title( '', '',  false );
    138139    $separator = "\n";
     
    140141    foreach ( $tags as $i => $str ) {
    141142        if ( strstr( $str, ">$current_tag<" ) ) {
    142             unset($tags[$i]);
     143            unset( $tags[$i] );
    143144            break;
    144145        }
     
    147148        return false;
    148149
    149     return trim(join( $glue, $tags ));
     150    return trim( join( $glue, $tags ) );
    150151} // end tag_ur_it
    151152
    152153// Register widgetized areas
    153 function theme_widgets_init() {
     154function twentyten_widgets_init() {
    154155    // Area 1
    155     register_sidebar( array (
     156    register_sidebar( array(
    156157        'name' => 'Primary Widget Area',
    157158        'id' => 'primary-widget-area',
    158         'description' => __('The primary widget area' , 'twentyten'),
     159        'description' => __( 'The primary widget area' , 'twentyten' ),
    159160        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    160161        'after_widget' => "</li>",
     
    164165
    165166    // Area 2
    166     register_sidebar( array (
     167    register_sidebar( array(
    167168        'name' => 'Secondary Widget Area',
    168169        'id' => 'secondary-widget-area',
    169         'description' => __('The secondary widget area' , 'twentyten'),
     170        'description' => __( 'The secondary widget area' , 'twentyten' ),
    170171        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    171172        'after_widget' => "</li>",
     
    175176
    176177    // Area 3
    177     register_sidebar( array (
     178    register_sidebar( array(
    178179        'name' => 'First Footer Widget Area',
    179180        'id' => 'first-footer-widget-area',
    180         'description' => __('The first footer widget area' , 'twentyten'),
     181        'description' => __( 'The first footer widget area' , 'twentyten' ),
    181182        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    182183        'after_widget' => "</li>",
     
    186187
    187188    // Area 4
    188     register_sidebar( array (
     189    register_sidebar( array(
    189190        'name' => 'Second Footer Widget Area',
    190191        'id' => 'second-footer-widget-area',
    191         'description' => __('The second footer widget area' , 'twentyten'),
     192        'description' => __( 'The second footer widget area' , 'twentyten' ),
    192193        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    193194        'after_widget' => "</li>",
     
    197198
    198199    // Area 5
    199     register_sidebar( array (
     200    register_sidebar( array(
    200201        'name' => 'Third Footer Widget Area',
    201202        'id' => 'third-footer-widget-area',
    202         'description' => __('The third footer widget area' , 'twentyten'),
     203        'description' => __( 'The third footer widget area' , 'twentyten' ),
    203204        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    204205        'after_widget' => "</li>",
     
    208209
    209210    // Area 6
    210     register_sidebar( array (
     211    register_sidebar( array(
    211212        'name' => 'Fourth Footer Widget Area',
    212213        'id' => 'fourth-footer-widget-area',
    213         'description' => __('The fourth footer widget area' , 'twentyten'),
     214        'description' => __( 'The fourth footer widget area' , 'twentyten' ),
    214215        'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
    215216        'after_widget' => "</li>",
     
    221222
    222223// Add all the groovy widget areas
    223 add_action( 'init', 'theme_widgets_init' );
     224add_action( 'init', 'twentyten_widgets_init' );
  • trunk/wp-content/themes/twentyten/header.php

    r13112 r13128  
    66            single_post_title(); echo ' | '; bloginfo('name');
    77        } elseif ( is_home() || is_front_page() ) {
    8             bloginfo('name'); echo ' | '; bloginfo('description'); get_page_number();
     8            bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_get_page_number();
    99        } elseif ( is_page() ) {
    1010            single_post_title(''); echo ' | '; bloginfo('name');
    1111        } elseif ( is_search() ) {
    12             printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); get_page_number(); echo ' | '; bloginfo('name');
     12            printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_get_page_number(); echo ' | '; bloginfo('name');
    1313        } elseif ( is_404() ) {
    1414            _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
    1515        } else {
    16             wp_title(''); echo ' | '; bloginfo('name'); get_page_number();
     16            wp_title(''); echo ' | '; bloginfo('name'); twentyten_get_page_number();
    1717        }
    1818    ?></title>
     
    2828    <?php wp_head(); ?>
    2929
    30     <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( esc_attr__( '%s latest posts', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
    31     <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( esc_attr__( '%s latest comments', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
    32     <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
     30    <link rel="alternate" type="application/rss+xml" href="<?php bloginfo( 'rss2_url' ); ?>" title="<?php printf( esc_attr__( '%s latest posts', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
     31    <link rel="alternate" type="application/rss+xml" href="<?php bloginfo( 'comments_rss2_url' ); ?>" title="<?php printf( esc_attr__( '%s latest comments', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
     32    <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
    3333</head>
    3434
     
    4040
    4141            <div id="branding">
    42                 <div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
    43                 <div id="site-description"><?php bloginfo( 'description' ) ?></div>
     42                <div id="site-title"><span><a href="<?php home_url(); ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
     43                <div id="site-description"><?php bloginfo( 'description' ); ?></div>
    4444
    4545                <?php
     
    5353
    5454            <div id="access">
    55                 <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>
     55                <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>
    5656                <?php wp_page_menu( 'sort_column=menu_order' ); ?>
    5757            </div><!-- #access -->
  • trunk/wp-content/themes/twentyten/index.php

    r13111 r13128  
    66<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    77                <div id="nav-above" class="navigation">
    8                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    9                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     8                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     9                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    1010                </div><!-- #nav-above -->
    1111<?php } ?>
     
    1717
    1818            <div class="entry-meta">
    19                 <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    20                 <a href="<?php
    21 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    22                 <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    23                 <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     19                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     20                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     21                <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
     22                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    2423            </div><!-- .entry-meta -->
    2524
    2625            <div class="entry-content">
    27                 <div class="gallery-thumb"><a class="size-thumbnail" href="<?php the_permalink() ?>"><?php
    28                 $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
    29                 $total_images = count($images);
    30                 $image = array_shift($images);
    31                 echo wp_get_attachment_image( $image->ID, 'thumbnail' );
    32                 ?></a></div>
     26                <div class="gallery-thumb">
     27                    <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
     28                    $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
     29                    $total_images = count($images);
     30                    $image = array_shift($images);
     31                    echo wp_get_attachment_image( $image->ID, 'thumbnail' );
     32                    ?></a>
     33                </div>
    3334                <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
    3435
    35                 <?php the_excerpt(''); ?>
     36                <?php the_excerpt( '' ); ?>
    3637            </div><!-- .entry-content -->
    3738
     
    4243                ?>
    4344                <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
    44 
    45                 <span class="meta-sep"> | </span>
    46 
    47                 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    48 
    49             <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     45                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
     46                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     47                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    5048            </div><!-- #entry-utility -->
    5149        </div>
     
    5553        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
    5654            <div class="entry-content">
    57 <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
     55                <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
    5856            </div><!-- .entry-content -->
    5957
    6058            <div class="entry-utility">
    61                 <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    62                 <a href="<?php
    63 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    64                 <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    65                 <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
    66                 <span class="meta-sep"> | </span>
    67                 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    68                 <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     59                <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     60                <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     61                <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
     62                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
     63                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
     64                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     65                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    6966            </div><!-- #entry-utility -->
    7067        </div><!-- #post-<?php the_ID(); ?> -->
     
    7875                <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    7976                <a href="<?php
    80 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    81                 <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    82                 <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     77the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     78                <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
     79                <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    8380            </div><!-- .entry-meta -->
    8481
    8582            <div class="entry-content">
    86 <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
    87 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
     83                <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
     84                <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
    8885            </div><!-- .entry-content -->
    8986
    9087            <div class="entry-utility">
    91                 <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
    92                 <span class="meta-sep"> | </span>
    93                 <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
    94                 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    95                 <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     88                <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
     89                <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
     90                <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
     91                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     92                <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    9693            </div><!-- #entry-utility -->
    9794        </div><!-- #post-<?php the_ID(); ?> -->
    9895
    99 <?php comments_template(); ?>
     96        <?php comments_template( '', true ); ?>
    10097
    10198    <?php } ?>
     
    105102        <div class="entry-content">
    106103            <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
    107         <?php get_search_form(); ?>
     104            <?php get_search_form(); ?>
    108105        </div>
    109106    <?php endif; ?>
     
    111108<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    112109                <div id="nav-below" class="navigation">
    113                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    114                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     110                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     111                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    115112                </div><!-- #nav-below -->
    116113<?php } ?>
  • trunk/wp-content/themes/twentyten/page.php

    r13025 r13128  
    99                    <h1 class="entry-title"><?php the_title(); ?></h1>
    1010                    <div class="entry-content">
    11 <?php the_content(); ?>
    12 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
    13 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?>
     11                        <?php the_content(); ?>
     12                        <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
     13                        <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
    1414                    </div><!-- .entry-content -->
    1515                </div><!-- #post-<?php the_ID(); ?> -->
    1616
    17 <?php comments_template(); ?>
     17                <?php comments_template( '', true ); ?>
    1818
    1919            </div><!-- #content -->
  • trunk/wp-content/themes/twentyten/search.php

    r13111 r13128  
    1010<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    1111                <div id="nav-above" class="navigation">
    12                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    13                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     12                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     13                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    1414                </div><!-- #nav-above -->
    1515<?php } ?>
    1616
    17 <?php while ( have_posts() ) : the_post() ?>
     17<?php while ( have_posts() ) : the_post(); ?>
    1818
    1919                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
    2020                    <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
    2121
    22 <?php if ( $post->post_type == 'post' ) { ?>
     22<?php if ( $post->post_type != 'page' ) : ?>
    2323                    <div class="entry-meta">
    24                         <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    25                         <a href="<?php
    26         the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    27                         <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    28                         <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     24                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     25                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     26                        <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
     27                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    2928                    </div><!-- .entry-meta -->
    30 <?php } ?>
     29<?php endif; ?>
    3130
    3231                    <div class="entry-summary">
    33 <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
    34 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
     32                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
     33                        <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
    3534                    </div><!-- .entry-summary -->
    3635
    37 <?php if ( $post->post_type == 'post' ) { ?>
     36<?php if ( $post->post_type != 'page' ) : ?>
    3837                    <div class="entry-utility">
    3938                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
    4039                        <span class="meta-sep"> | </span>
    41                         <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
    42                         <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    43                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     40                        <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
     41                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     42                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    4443                    </div><!-- #entry-utility -->
    45 <?php } ?>
     44<?php endif; ?>
    4645                </div><!-- #post-<?php the_ID(); ?> -->
    4746
     
    5049<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    5150                <div id="nav-below" class="navigation">
    52                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    53                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     51                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     52                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    5453                </div><!-- #nav-below -->
    5554<?php } ?>
     
    5857
    5958                <div id="post-0" class="post no-results not-found">
    60                     <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2>
     59                    <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
    6160                    <div class="entry-content">
    6261                        <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
    63     <?php get_search_form(); ?>
     62                        <?php get_search_form(); ?>
    6463                    </div><!-- .entry-content -->
    6564                </div>
  • trunk/wp-content/themes/twentyten/searchform.php

    r13029 r13128  
    11    <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
    22        <div>
    3             <label for="s"><?php _e('Search', 'twentyten'); ?></label>
     3            <label for="s"><?php _e( 'Search', 'twentyten' ); ?></label>
    44            <input type="text" id="s" name="s" />
    5             <input type="submit" id="searchsubmit" value="<?php esc_attr_e('Search', 'twentyten'); ?>" />
     5            <input type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyten' ); ?>" />
    66        </div>
    77    </form>
  • trunk/wp-content/themes/twentyten/sidebar-footer.php

    r13025 r13128  
    11<?php
    2     if ( is_active_sidebar('first-footer-widget-area') || is_active_sidebar('second-footer-widget-area') || is_active_sidebar('third-footer-widget-area') || is_active_sidebar('fourth-footer-widget-area') ) :
     2    if ( is_active_sidebar('first-footer-widget-area') ||
     3        is_active_sidebar('second-footer-widget-area') ||
     4        is_active_sidebar('third-footer-widget-area') ||
     5        is_active_sidebar('fourth-footer-widget-area') ) :
    36?>
    47            <div id="footer-widget-area">
     
    69                    <div id="first" class="widget-area">
    710                        <ul class="xoxo">
    8                             <?php dynamic_sidebar('first-footer-widget-area'); ?>
     11                            <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
    912                        </ul>
    1013                    </div><!-- #first .widget-area -->
     
    1417                <div id="second" class="widget-area">
    1518                    <ul class="xoxo">
    16                         <?php dynamic_sidebar('second-footer-widget-area'); ?>
     19                        <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
    1720                    </ul>
    1821                </div><!-- #second .widget-area -->
     
    2225                <div id="third" class="widget-area">
    2326                    <ul class="xoxo">
    24                         <?php dynamic_sidebar('third-footer-widget-area'); ?>
     27                        <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
    2528                    </ul>
    2629                </div><!-- #third .widget-area -->
     
    3033                <div id="fourth" class="widget-area">
    3134                    <ul class="xoxo">
    32                         <?php dynamic_sidebar('fourth-footer-widget-area'); ?>
     35                        <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
    3336                    </ul>
    3437                </div><!-- #fourth .widget-area -->
  • trunk/wp-content/themes/twentyten/sidebar.php

    r13025 r13128  
    77
    88            <li id="archives" class="widget-container">
    9                 <h3 class="widget-title"><?php _e('Archives', 'twentyten') ?></h3>
     9                <h3 class="widget-title"><?php _e( 'Archives', 'twentyten' ); ?></h3>
    1010                <ul>
    11 <?php wp_get_archives('type=monthly') ?>
     11                    <?php wp_get_archives( 'type=monthly' ); ?>
    1212                </ul>
    1313            </li>
    1414
    1515            <li id="meta" class="widget-container">
    16                 <h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3>
     16                <h3 class="widget-title"><?php _e( 'Meta', 'twentyten' ); ?></h3>
    1717                <ul>
    18                     <?php wp_register() ?>
    19 
    20                     <li><?php wp_loginout() ?></li>
    21                     <?php wp_meta() ?>
    22 
     18                    <?php wp_register(); ?>
     19                    <li><?php wp_loginout(); ?></li>
     20                    <?php wp_meta(); ?>
    2321                </ul>
    2422            </li>
    25 <?php endif; // end primary widget area  ?>
     23<?php endif; // end primary widget area ?>
    2624            </ul>
    2725        </div><!-- #primary .widget-area -->
     
    3028        <div id="secondary" class="widget-area">
    3129            <ul class="xoxo">
    32                 <?php dynamic_sidebar('secondary-widget-area'); ?>
     30                <?php dynamic_sidebar( 'secondary-widget-area' ); ?>
    3331            </ul>
    3432        </div><!-- #secondary .widget-area -->
  • trunk/wp-content/themes/twentyten/single.php

    r13111 r13128  
    77
    88                <div id="nav-above" class="navigation">
    9                     <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
    10                     <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
     9                    <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
     10                    <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
    1111                </div><!-- #nav-above -->
    1212
     
    1515
    1616                    <div class="entry-meta">
    17                         <span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span>
    18                         <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
    19                         <span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span>
    20                         <a href="<?php
    21 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    22                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
     17                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted by ', 'twentyten' ); ?></span>
     18                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
     19                        <span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span>
     20                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     21                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
    2322                    </div><!-- .entry-meta -->
    2423
    2524                    <div class="entry-content">
    26 <?php the_content(); ?>
    27 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
     25                        <?php the_content(); ?>
     26                        <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
    2827                    </div><!-- .entry-content -->
    2928
     
    3130                    <div id="entry-author-info">
    3231                        <div id="author-avatar">
    33 <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
     32                            <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
    3433                        </div><!-- #author-avatar   -->
    3534                        <div id="author-description">
    36                             <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
    37 <?php the_author_meta('description'); ?>
     35                            <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
     36                            <?php the_author_meta('description'); ?>
    3837                            <div id="author-link">
    39                                 <a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php _e('View all posts by ', 'twentyten'); ?><?php the_author(); ?> &rarr;</a>
     38                                <a href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
    4039                            </div><!-- #author-link -->
    4140                        </div><!-- #author-description  -->
     
    4948                        get_permalink(),
    5049                        the_title_attribute('echo=0'),
    51                         get_post_comments_feed_link() ) ?>
     50                        get_post_comments_feed_link() ); ?>
    5251
    53 <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
     52<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
    5453                    </div><!-- .entry-utility -->
    5554                </div><!-- #post-<?php the_ID(); ?> -->
    5655
    5756                <div id="nav-below" class="navigation">
    58                     <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
    59                     <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
     57                    <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
     58                    <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
    6059                </div><!-- #nav-below -->
    6160
    62 <?php comments_template('', true); ?>
     61                <?php comments_template( '', true ); ?>
    6362
    6463            </div><!-- #content -->
  • trunk/wp-content/themes/twentyten/tag.php

    r13111 r13128  
    66<?php the_post(); ?>
    77
    8                 <h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1>
     8                <h1 class="page-title"><?php _e( 'Tag Archives: ', 'twentyten' ); ?><span><?php single_tag_title(); ?></span></h1>
    99
    1010<?php rewind_posts(); ?>
     
    1212<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    1313                <div id="nav-above" class="navigation">
    14                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    15                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     14                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     15                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    1616                </div><!-- #nav-above -->
    1717<?php } ?>
     
    2323
    2424                    <div class="entry-meta">
    25                         <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
    26                         <a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
    27                         <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
    28                         <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
     25                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
     26                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
     27                        <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
     28                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
    2929                    </div><!-- .entry-meta -->
    3030
    3131                    <div class="entry-summary">
    32 <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
     32                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
    3333                    </div><!-- .entry-summary -->
    3434
    3535                    <div class="entry-utility">
    36                         <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
    37                         <span class="meta-sep"> | </span>
     36                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
     37                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
    3838<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
    39                         <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span>
     39                        <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ); ?></span>
    4040<?php endif; ?>
    41                         <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
    42                         <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
     41                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
     42                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
    4343                    </div><!-- #entry-utility -->
    4444                </div><!-- #post-<?php the_ID(); ?> -->
     
    4848<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
    4949                <div id="nav-below" class="navigation">
    50                     <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
    51                     <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
     50                    <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
     51                    <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
    5252                </div><!-- #nav-below -->
    5353<?php } ?>
Note: See TracChangeset for help on using the changeset viewer.