WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@13128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-14 01:00:22 +00:00
parent 99c15de631
commit f2799cb2e9
17 changed files with 247 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-content/themes/twentyten/404.php
View File

@ -4,9 +4,9 @@
<div id="content"> <div id="content">
<div id="post-0" class="post error404 not-found"> <div id="post-0" class="post error404 not-found">
<h1 class="entry-title">Not Found</h1> <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
<div class="entry-content"> <div class="entry-content">
<p>Apologies, but the page you requested could not be found. Perhaps searching will help.</p> <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
<?php get_search_form(); ?> <?php get_search_form(); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div><!-- #post-0 --> </div><!-- #post-0 -->

31
wp-content/themes/twentyten/archive.php
View File

@ -6,21 +6,21 @@
<?php the_post(); ?> <?php the_post(); ?>
<?php if ( is_day() ) : ?> <?php if ( is_day() ) : ?>
<h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ) ?></h1> <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?></h1>
<?php elseif ( is_month() ) : ?> <?php elseif ( is_month() ) : ?>
<h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ) ?></h1> <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
<?php elseif ( is_year() ) : ?> <?php elseif ( is_year() ) : ?>
<h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ) ?></h1> <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
<?php elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) : ?> <?php elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) : ?>
<h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ) ?></h1> <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
<?php endif; ?> <?php endif; ?>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
@ -31,10 +31,9 @@
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
<a href="<?php <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>
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> <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <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>
<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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
@ -43,10 +42,10 @@
<div class="entry-utility"> <div class="entry-utility">
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
<?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" ) ?> <?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
@ -54,8 +53,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>

32
wp-content/themes/twentyten/attachment.php
View File

@ -5,18 +5,18 @@
<?php the_post(); ?> <?php the_post(); ?>
<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> <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>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><?php the_title(); ?></h2> <h2 class="entry-title"><?php the_title(); ?></h2>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'By ', 'twentyten' ); ?></span>
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
<span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-entry-date"><?php _e( 'Published ', 'twentyten' ); ?></span>
<span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php echo get_the_date(); ?></abbr></span> <span class="entry-date"><abbr class="published" title="<?php the_time() ?>"><?php echo get_the_date(); ?></abbr></span>
<?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" ) ?> <?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" ); ?>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
@ -32,13 +32,13 @@
<div class="nav-next"><?php next_image_link( false ); ?></div> <div class="nav-next"><?php next_image_link( false ); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php else : ?> <?php else : ?>
<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> <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>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div> <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); ?></div>
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
@ -48,18 +48,18 @@
get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
get_permalink(), get_permalink(),
the_title_attribute('echo=0'), the_title_attribute('echo=0'),
get_post_comments_feed_link() ) ?> get_post_comments_feed_link() ); ?>
<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
<?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() ) ?> <?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() ); ?>
<?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?> <?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?>
<?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() ) ?> <?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() ); ?>
<?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?> <?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?>
<?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ) ?> <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
<?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?> <?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>
<?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ) ?> <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
<?php endif; ?> <?php endif; ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
</div><!-- .entry-utility --> </div><!-- .entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->

29
wp-content/themes/twentyten/author.php
View File

@ -5,16 +5,16 @@
<?php the_post(); ?> <?php the_post(); ?>
<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> <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>
<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
<div id="entry-author-info"> <div id="entry-author-info">
<div id="author-avatar"> <div id="author-avatar">
<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</div><!-- #author-avatar --> </div><!-- #author-avatar -->
<div id="author-description"> <div id="author-description">
<h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2> <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
<?php the_author_meta('description'); ?> <?php the_author_meta('description'); ?>
</div><!-- #author-description --> </div><!-- #author-description -->
</div><!-- .entry-author-info --> </div><!-- .entry-author-info -->
<?php endif; ?> <?php endif; ?>
@ -23,8 +23,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
@ -34,21 +34,20 @@
<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> <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>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<div class="entry-utility"> <div class="entry-utility">
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"> | </span>
<?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" ) ?> <?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
@ -56,8 +55,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>

34
wp-content/themes/twentyten/category.php
View File

@ -1,4 +1,3 @@
<?php get_header(); ?> <?php get_header(); ?>
<div id="container"> <div id="container">
@ -6,15 +5,15 @@
<?php the_post(); ?> <?php the_post(); ?>
<h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1> <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
<?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?> <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
@ -24,25 +23,24 @@
<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> <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>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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> <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <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>
<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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<div class="entry-utility"> <div class="entry-utility">
<?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?> <?php if ( $cats_meow = cats_meow( ', ' ) ) : // Returns categories other than the one queried ?>
<span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span> <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ); ?></span>
<span class="meta-sep"> | </span> <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
<?php endif ?> <?php endif ?>
<?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" ) ?> <?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
@ -50,8 +48,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>

16
wp-content/themes/twentyten/comments.php
View File

@ -1,12 +1,12 @@
<div id="comments"> <div id="comments">
<?php <?php
// Do not delete these lines // Do not delete these lines
$req = get_option('require_name_email'); // Checks if fields are required. $req = get_option( 'require_name_email' ); // Checks if fields are required.
if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) ) if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
die ( 'Please do not load this page directly. Thanks!' ); die ( __( 'Please do not load this page directly. Thanks!', 'twentyten' ) );
if ( post_password_required() ) : if ( post_password_required() ) :
?> ?>
<div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyten') ?></div> <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
</div><!-- .comments --> </div><!-- .comments -->
<?php <?php
return; return;
@ -22,19 +22,19 @@
<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?> <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
<div class="navigation"> <div class="navigation">
<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div> <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div> <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
</div> </div>
<?php endif; // check for comment navigation ?> <?php endif; // check for comment navigation ?>
<ol class="commentlist"> <ol class="commentlist">
<?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?> <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
</ol> </ol>
<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?> <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
<div class="navigation"> <div class="navigation">
<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div> <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div> <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
</div> </div>
<?php endif; // check for comment navigation ?> <?php endif; // check for comment navigation ?>

4
wp-content/themes/twentyten/footer.php
View File

@ -3,10 +3,10 @@
<div id="footer"> <div id="footer">
<div id="colophon"> <div id="colophon">
<?php get_sidebar('footer'); ?> <?php get_sidebar( 'footer' ); ?>
<div id="site-info"> <div id="site-info">
<a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a> <a href="<?php home_url() ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</div> </div>
<div id="site-generator"> <div id="site-generator">

99
wp-content/themes/twentyten/functions.php
View File

@ -1,7 +1,7 @@
<?php <?php
// Set the content width based on the Theme CSS // Set the content width based on the Theme CSS
$content_width = apply_filters('twentyten_content_width', 640 ); $content_width = apply_filters( 'twentyten_content_width', 640 );
// Your Changeable header business starts here // Your Changeable header business starts here
// No CSS, just IMG call // No CSS, just IMG call
@ -25,7 +25,7 @@ function twentyten_admin_header_style() {
<?php <?php
} }
add_custom_image_header('', 'twentyten_admin_header_style'); add_custom_image_header( '', 'twentyten_admin_header_style' );
// and thus ends the changeable header business // and thus ends the changeable header business
add_custom_background(); add_custom_background();
@ -44,118 +44,119 @@ load_theme_textdomain( 'twentyten', TEMPLATEPATH . '/languages' );
$locale = get_locale(); $locale = get_locale();
$locale_file = TEMPLATEPATH . "/languages/$locale.php"; $locale_file = TEMPLATEPATH . "/languages/$locale.php";
if ( is_readable($locale_file) ) if ( is_readable($locale_file) )
require_once($locale_file); require_once( $locale_file );
// Get the page number // Get the page number
function get_page_number() { function twentyten_get_page_number() {
if ( get_query_var('paged') ) if ( get_query_var('paged') )
echo ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged'); echo ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');
} }
// Control excerpt length // Control excerpt length
function new_excerpt_length($length) { function twentyten_new_excerpt_length( $length ) {
return 40; return 40;
} }
add_filter('excerpt_length', 'new_excerpt_length'); add_filter( 'excerpt_length', 'twentyten_new_excerpt_length' );
// Make a nice read more link on excerpts // Make a nice read more link on excerpts
function new_excerpt_more($more) { function twentyten_new_excerpt_more($more) {
return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>'; return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
} }
add_filter('excerpt_more', 'new_excerpt_more'); add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' );
// Template for comments and pingbacks // Template for comments and pingbacks
function twentyten_comment($comment, $args, $depth) { function twentyten_list_comment( $comment, $args, $depth ) {
$GLOBALS ['comment'] = $comment; ?> $GLOBALS['comment'] = $comment; ?>
<?php if ('' == $comment->comment_type) { ?> <?php if ( '' == $comment->comment_type ) { ?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
<div id="comment-<?php comment_ID(); ?>"> <div id="comment-<?php comment_ID(); ?>">
<div class="comment-author vcard"> <div class="comment-author vcard">
<?php echo get_avatar($comment, 40); ?> <?php echo get_avatar( $comment, 40 ); ?>
<?php printf( __('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link() ); ?>
<?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?>
</div> </div>
<?php if ($comment->comment_approved == '0') : ?> <?php if ( $comment->comment_approved == '0' ) : ?>
<em><?php _e('Your comment is awaiting moderation.') ?></em> <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
<br /> <br />
<?php endif; ?> <?php endif; ?>
<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> <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>
<div class="comment-body"><?php comment_text() ?></div> <div class="comment-body"><?php comment_text(); ?></div>
<div class="reply"> <div class="reply">
<?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?> <?php comment_reply_link( array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth'])) ); ?>
</div> </div>
</div> </div>
<?php } else { ?> <?php } else { ?>
<li class="post pingback"> <li class="post pingback">
<p><?php _e('Pingback:') ?> <?php comment_author_link ()?><?php edit_comment_link ( 'edit', '&nbsp;&nbsp;', '' ); ?></p> <p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
<?php } <?php }
} }
// Make the Visual Editor styles match the theme's styles // Make the Visual Editor styles match the theme's styles
function my_editor_style($url) { function twentyten_my_editor_style( $url ) {
if ( !empty($url) ) if ( !empty($url) )
$url .= ','; $url .= ',';
// Change the path here if using sub-directory // Change the path here if using sub-directory
$url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css'; $url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';
return $url; return $url;
} }
add_filter('mce_css', 'my_editor_style'); add_filter( 'mce_css', 'twentyten_my_editor_style' );
// Remove inline styles on gallery shortcode // Remove inline styles on gallery shortcode
function remove_gallery_css() { function twentyten_remove_gallery_css() {
return "<div class='gallery'>"; return "<div class='gallery'>";
} }
add_filter('gallery_style', 'remove_gallery_css'); add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
// For category lists on category archives: Returns other categories except the current one (redundant) // For category lists on category archives: Returns other categories except the current one (redundant)
function cats_meow($glue) { function cats_meow( $glue ) {
$current_cat = single_cat_title( '', false ); $current_cat = single_cat_title( '', false );
$separator = "\n"; $separator = "\n";
$cats = explode( $separator, get_the_category_list($separator) ); $cats = explode( $separator, get_the_category_list($separator) );
foreach ( $cats as $i => $str ) { foreach ( $cats as $i => $str ) {
if ( strstr( $str, ">$current_cat<" ) ) { if ( strstr( $str, ">$current_cat<" ) ) {
unset($cats[$i]); unset( $cats[$i] );
break; break;
} }
} }
if ( empty($cats) ) if ( empty($cats) )
return false; return false;
return trim(join( $glue, $cats )); return trim( join( $glue, $cats ) );
} // end cats_meow } // end cats_meow
// For tag lists on tag archives: Returns other tags except the current one (redundant) // For tag lists on tag archives: Returns other tags except the current one (redundant)
function tag_ur_it($glue) { function tag_ur_it( $glue ) {
$current_tag = single_tag_title( '', '', false ); $current_tag = single_tag_title( '', '', false );
$separator = "\n"; $separator = "\n";
$tags = explode( $separator, get_the_tag_list( "", "$separator", "" ) ); $tags = explode( $separator, get_the_tag_list( "", "$separator", "" ) );
foreach ( $tags as $i => $str ) { foreach ( $tags as $i => $str ) {
if ( strstr( $str, ">$current_tag<" ) ) { if ( strstr( $str, ">$current_tag<" ) ) {
unset($tags[$i]); unset( $tags[$i] );
break; break;
} }
} }
if ( empty($tags) ) if ( empty($tags) )
return false; return false;
return trim(join( $glue, $tags )); return trim( join( $glue, $tags ) );
} // end tag_ur_it } // end tag_ur_it
// Register widgetized areas // Register widgetized areas
function theme_widgets_init() { function twentyten_widgets_init() {
// Area 1 // Area 1
register_sidebar( array ( register_sidebar( array(
'name' => 'Primary Widget Area', 'name' => 'Primary Widget Area',
'id' => 'primary-widget-area', 'id' => 'primary-widget-area',
'description' => __('The primary widget area' , 'twentyten'), 'description' => __( 'The primary widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -163,10 +164,10 @@ function theme_widgets_init() {
) ); ) );
// Area 2 // Area 2
register_sidebar( array ( register_sidebar( array(
'name' => 'Secondary Widget Area', 'name' => 'Secondary Widget Area',
'id' => 'secondary-widget-area', 'id' => 'secondary-widget-area',
'description' => __('The secondary widget area' , 'twentyten'), 'description' => __( 'The secondary widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -174,10 +175,10 @@ function theme_widgets_init() {
) ); ) );
// Area 3 // Area 3
register_sidebar( array ( register_sidebar( array(
'name' => 'First Footer Widget Area', 'name' => 'First Footer Widget Area',
'id' => 'first-footer-widget-area', 'id' => 'first-footer-widget-area',
'description' => __('The first footer widget area' , 'twentyten'), 'description' => __( 'The first footer widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -185,10 +186,10 @@ function theme_widgets_init() {
) ); ) );
// Area 4 // Area 4
register_sidebar( array ( register_sidebar( array(
'name' => 'Second Footer Widget Area', 'name' => 'Second Footer Widget Area',
'id' => 'second-footer-widget-area', 'id' => 'second-footer-widget-area',
'description' => __('The second footer widget area' , 'twentyten'), 'description' => __( 'The second footer widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -196,10 +197,10 @@ function theme_widgets_init() {
) ); ) );
// Area 5 // Area 5
register_sidebar( array ( register_sidebar( array(
'name' => 'Third Footer Widget Area', 'name' => 'Third Footer Widget Area',
'id' => 'third-footer-widget-area', 'id' => 'third-footer-widget-area',
'description' => __('The third footer widget area' , 'twentyten'), 'description' => __( 'The third footer widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -207,10 +208,10 @@ function theme_widgets_init() {
) ); ) );
// Area 6 // Area 6
register_sidebar( array ( register_sidebar( array(
'name' => 'Fourth Footer Widget Area', 'name' => 'Fourth Footer Widget Area',
'id' => 'fourth-footer-widget-area', 'id' => 'fourth-footer-widget-area',
'description' => __('The fourth footer widget area' , 'twentyten'), 'description' => __( 'The fourth footer widget area' , 'twentyten' ),
'before_widget' => '<li id="%1$s" class="widget-container %2$s">', 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
'after_widget' => "</li>", 'after_widget' => "</li>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
@ -220,4 +221,4 @@ function theme_widgets_init() {
} // end theme_widgets_init } // end theme_widgets_init
// Add all the groovy widget areas // Add all the groovy widget areas
add_action( 'init', 'theme_widgets_init' ); add_action( 'init', 'twentyten_widgets_init' );

18
wp-content/themes/twentyten/header.php
View File

@ -5,15 +5,15 @@
if ( is_single() ) { if ( is_single() ) {
single_post_title(); echo ' | '; bloginfo('name'); single_post_title(); echo ' | '; bloginfo('name');
} elseif ( is_home() || is_front_page() ) { } elseif ( is_home() || is_front_page() ) {
bloginfo('name'); echo ' | '; bloginfo('description'); get_page_number(); bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_get_page_number();
} elseif ( is_page() ) { } elseif ( is_page() ) {
single_post_title(''); echo ' | '; bloginfo('name'); single_post_title(''); echo ' | '; bloginfo('name');
} elseif ( is_search() ) { } elseif ( is_search() ) {
printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); get_page_number(); echo ' | '; bloginfo('name'); printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_get_page_number(); echo ' | '; bloginfo('name');
} elseif ( is_404() ) { } elseif ( is_404() ) {
_e('Not Found', 'twentyten'); echo ' | '; bloginfo('name'); _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
} else { } else {
wp_title(''); echo ' | '; bloginfo('name'); get_page_number(); wp_title(''); echo ' | '; bloginfo('name'); twentyten_get_page_number();
} }
?></title> ?></title>
@ -27,9 +27,9 @@
<?php wp_head(); ?> <?php wp_head(); ?>
<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') ) ); ?>" /> <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') ) ); ?>" />
<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') ) ); ?>" /> <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') ) ); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
@ -39,8 +39,8 @@
<div id="masthead"> <div id="masthead">
<div id="branding"> <div id="branding">
<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> <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>
<div id="site-description"><?php bloginfo( 'description' ) ?></div> <div id="site-description"><?php bloginfo( 'description' ); ?></div>
<?php <?php
global $post; global $post;
@ -52,7 +52,7 @@
</div><!-- #branding --> </div><!-- #branding -->
<div id="access"> <div id="access">
<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> <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>
<?php wp_page_menu( 'sort_column=menu_order' ); ?> <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</div><!-- #access --> </div><!-- #access -->

83
wp-content/themes/twentyten/index.php
View File

@ -5,8 +5,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
@ -16,23 +16,24 @@
<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> <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>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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> <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <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>
<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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
<div class="gallery-thumb"><a class="size-thumbnail" href="<?php the_permalink() ?>"><?php <div class="gallery-thumb">
$images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) ); <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
$total_images = count($images); $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
$image = array_shift($images); $total_images = count($images);
echo wp_get_attachment_image( $image->ID, 'thumbnail' ); $image = array_shift($images);
?></a></div> echo wp_get_attachment_image( $image->ID, 'thumbnail' );
?></a>
</div>
<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> <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>
<?php the_excerpt(''); ?> <?php the_excerpt( '' ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<div class="entry-utility"> <div class="entry-utility">
@ -41,12 +42,9 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
$category_link = get_category_link( $category_id ); $category_link = get_category_link( $category_id );
?> ?>
<a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a> <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
<span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
<span class="meta-sep"> | </span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
<?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" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div> </div>
@ -54,18 +52,17 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
<?php } elseif ( in_category( 'asides' ) ) { ?> <?php } elseif ( in_category( 'asides' ) ) { ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<div class="entry-content"> <div class="entry-content">
<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<div class="entry-utility"> <div class="entry-utility">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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> <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <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>
<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> <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
<span class="meta-sep"> | </span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <?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" ); ?>
<?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" ) ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
@ -77,26 +74,26 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
<a href="<?php <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> the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
<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> <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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<div class="entry-utility"> <div class="entry-utility">
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
<?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" ) ?> <?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php comments_template(); ?> <?php comments_template( '', true ); ?>
<?php } ?> <?php } ?>
<?php endwhile; ?> <?php endwhile; ?>
@ -104,14 +101,14 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
<h2><?php _e( 'Not Found', 'twentyten' ); ?></h2> <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p> <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
<?php get_search_form(); ?> <?php get_search_form(); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>

8
wp-content/themes/twentyten/page.php
View File

@ -8,13 +8,13 @@
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php comments_template(); ?> <?php comments_template( '', true ); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->

41
wp-content/themes/twentyten/search.php
View File

@ -9,58 +9,57 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
<?php while ( have_posts() ) : the_post() ?> <?php while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<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> <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>
<?php if ( $post->post_type == 'post' ) { ?> <?php if ( $post->post_type != 'page' ) : ?>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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> <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <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>
<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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<?php } ?> <?php endif; ?>
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<?php if ( $post->post_type == 'post' ) { ?> <?php if ( $post->post_type != 'page' ) : ?>
<div class="entry-utility"> <div class="entry-utility">
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"> | </span>
<?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" ) ?> <?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" ); ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
<?php } ?> <?php endif; ?>
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<?php endwhile; ?> <?php endwhile; ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>
<?php else : ?> <?php else : ?>
<div id="post-0" class="post no-results not-found"> <div id="post-0" class="post no-results not-found">
<h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2> <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
<?php get_search_form(); ?> <?php get_search_form(); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div> </div>

4
wp-content/themes/twentyten/searchform.php
View File

@ -1,7 +1,7 @@
<form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>"> <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
<div> <div>
<label for="s"><?php _e('Search', 'twentyten'); ?></label> <label for="s"><?php _e( 'Search', 'twentyten' ); ?></label>
<input type="text" id="s" name="s" /> <input type="text" id="s" name="s" />
<input type="submit" id="searchsubmit" value="<?php esc_attr_e('Search', 'twentyten'); ?>" /> <input type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyten' ); ?>" />
</div> </div>
</form> </form>

13
wp-content/themes/twentyten/sidebar-footer.php
View File

@ -1,11 +1,14 @@
<?php <?php
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') ) : 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') ) :
?> ?>
<div id="footer-widget-area"> <div id="footer-widget-area">
<?php if ( is_active_sidebar('first-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('first-footer-widget-area') ) : ?>
<div id="first" class="widget-area"> <div id="first" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar('first-footer-widget-area'); ?> <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
</ul> </ul>
</div><!-- #first .widget-area --> </div><!-- #first .widget-area -->
<?php endif; ?> <?php endif; ?>
@ -13,7 +16,7 @@
<?php if ( is_active_sidebar('second-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('second-footer-widget-area') ) : ?>
<div id="second" class="widget-area"> <div id="second" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar('second-footer-widget-area'); ?> <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
</ul> </ul>
</div><!-- #second .widget-area --> </div><!-- #second .widget-area -->
<?php endif; ?> <?php endif; ?>
@ -21,7 +24,7 @@
<?php if ( is_active_sidebar('third-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('third-footer-widget-area') ) : ?>
<div id="third" class="widget-area"> <div id="third" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar('third-footer-widget-area'); ?> <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
</ul> </ul>
</div><!-- #third .widget-area --> </div><!-- #third .widget-area -->
<?php endif; ?> <?php endif; ?>
@ -29,7 +32,7 @@
<?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?> <?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?>
<div id="fourth" class="widget-area"> <div id="fourth" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar('fourth-footer-widget-area'); ?> <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
</ul> </ul>
</div><!-- #fourth .widget-area --> </div><!-- #fourth .widget-area -->
<?php endif; ?> <?php endif; ?>

18
wp-content/themes/twentyten/sidebar.php
View File

@ -6,30 +6,28 @@
</li> </li>
<li id="archives" class="widget-container"> <li id="archives" class="widget-container">
<h3 class="widget-title"><?php _e('Archives', 'twentyten') ?></h3> <h3 class="widget-title"><?php _e( 'Archives', 'twentyten' ); ?></h3>
<ul> <ul>
<?php wp_get_archives('type=monthly') ?> <?php wp_get_archives( 'type=monthly' ); ?>
</ul> </ul>
</li> </li>
<li id="meta" class="widget-container"> <li id="meta" class="widget-container">
<h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3> <h3 class="widget-title"><?php _e( 'Meta', 'twentyten' ); ?></h3>
<ul> <ul>
<?php wp_register() ?> <?php wp_register(); ?>
<li><?php wp_loginout(); ?></li>
<li><?php wp_loginout() ?></li> <?php wp_meta(); ?>
<?php wp_meta() ?>
</ul> </ul>
</li> </li>
<?php endif; // end primary widget area ?> <?php endif; // end primary widget area ?>
</ul> </ul>
</div><!-- #primary .widget-area --> </div><!-- #primary .widget-area -->
<?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?> <?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
<div id="secondary" class="widget-area"> <div id="secondary" class="widget-area">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar('secondary-widget-area'); ?> <?php dynamic_sidebar( 'secondary-widget-area' ); ?>
</ul> </ul>
</div><!-- #secondary .widget-area --> </div><!-- #secondary .widget-area -->
<?php endif; ?> <?php endif; ?>

37
wp-content/themes/twentyten/single.php
View File

@ -6,37 +6,36 @@
<?php the_post(); ?> <?php the_post(); ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div> <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div> <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted by ', 'twentyten' ); ?></span>
<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> <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>
<span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span> <span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span>
<a href="<?php <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
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> <?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" ); ?>
<?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" ) ?>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
<div id="entry-author-info"> <div id="entry-author-info">
<div id="author-avatar"> <div id="author-avatar">
<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</div><!-- #author-avatar --> </div><!-- #author-avatar -->
<div id="author-description"> <div id="author-description">
<h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2> <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
<?php the_author_meta('description'); ?> <?php the_author_meta('description'); ?>
<div id="author-link"> <div id="author-link">
<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> <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>
</div><!-- #author-link --> </div><!-- #author-link -->
</div><!-- #author-description --> </div><!-- #author-description -->
</div><!-- .entry-author-info --> </div><!-- .entry-author-info -->
@ -48,18 +47,18 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
get_permalink(), get_permalink(),
the_title_attribute('echo=0'), the_title_attribute('echo=0'),
get_post_comments_feed_link() ) ?> get_post_comments_feed_link() ); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
</div><!-- .entry-utility --> </div><!-- .entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div> <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div> <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php comments_template('', true); ?> <?php comments_template( '', true ); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->

30
wp-content/themes/twentyten/tag.php
View File

@ -5,14 +5,14 @@
<?php the_post(); ?> <?php the_post(); ?>
<h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1> <h1 class="page-title"><?php _e( 'Tag Archives: ', 'twentyten' ); ?><span><?php single_tag_title(); ?></span></h1>
<?php rewind_posts(); ?> <?php rewind_posts(); ?>
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-above" class="navigation"> <div id="nav-above" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-above --> </div><!-- #nav-above -->
<?php } ?> <?php } ?>
@ -22,24 +22,24 @@
<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> <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>
<div class="entry-meta"> <div class="entry-meta">
<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
<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> <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span> <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
<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> <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>
</div><!-- .entry-meta --> </div><!-- .entry-meta -->
<div class="entry-summary"> <div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</div><!-- .entry-summary --> </div><!-- .entry-summary -->
<div class="entry-utility"> <div class="entry-utility">
<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> <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>
<span class="meta-sep"> | </span> <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?> <?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
<span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span> <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ); ?></span>
<?php endif; ?> <?php endif; ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?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" ) ?> <?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" ); ?>
</div><!-- #entry-utility --> </div><!-- #entry-utility -->
</div><!-- #post-<?php the_ID(); ?> --> </div><!-- #post-<?php the_ID(); ?> -->
@ -47,8 +47,8 @@
<?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
<div id="nav-below" class="navigation"> <div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</div><!-- #nav-below --> </div><!-- #nav-below -->
<?php } ?> <?php } ?>