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

Coding standards cleanup in twentyten, see #9015. Props sivel 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
iammattthomas 2010-03-16 20:17:22 +00:00
parent b98f319bcf
commit a70633cedc
16 changed files with 153 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,4 +23,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -5,7 +5,7 @@
<?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(); ?>>
<h2 class="entry-title"><?php the_title(); ?></h2>
@ -13,7 +13,7 @@
<div class="entry-meta">
<?php
printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten'),
get_author_posts_url( get_the_author_meta('ID') ),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
get_the_author()
);
@ -21,7 +21,7 @@
<span class="meta-sep"> | </span>
<?php
printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten'),
esc_attr(get_the_time()),
esc_attr( get_the_time() ),
get_the_date()
);
?>
@ -43,7 +43,7 @@
<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
<?php endif; ?>
</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 wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
@ -60,21 +60,21 @@
}
printf(
$utility_text,
get_the_category_list(', '),
get_the_category_list( ', ' ),
$tag_list,
get_permalink(),
the_title_attribute('echo=0'),
the_title_attribute( 'echo=0' ),
get_post_comments_feed_link()
);
?>
<?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 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 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 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 endif; ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
@ -87,4 +87,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -5,16 +5,16 @@
<?php the_post(); ?>
<h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='" . get_author_posts_url( get_the_author_meta('ID') ) . "' title='" . esc_attr(get_the_author()) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
<h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></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="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 id="author-description">
<h2><?php printf(__('About %s', 'twentyten'), get_the_author()); ?></h2>
<?php the_author_meta('description'); ?>
<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
<?php the_author_meta( 'description' ); ?>
</div><!-- #author-description -->
</div><!-- .entry-author-info -->
<?php endif; ?>
@ -27,4 +27,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -4,9 +4,9 @@
<div id="content">
<h1 class="page-title"><?php
printf(__( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title('', false) . '</span>');
printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</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 get_generic_template( 'loop', 'category' ); ?>
@ -14,4 +14,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -13,26 +13,26 @@
<?php if ( have_comments() ) : ?>
<h3 id="comments-title"><?php comments_number(
sprintf(__('No Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
sprintf(__('One Response to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
sprintf(__('%% Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>')
sprintf( __( 'No Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
sprintf( __( 'One Response to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
sprintf( __( '%% Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' )
); ?> </h3>
<?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
<div class="navigation">
<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-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
</div>
<?php endif; // check for comment navigation ?>
<ol class="commentlist">
<?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
<?php wp_list_comments( array( 'callback' => 'twentyten_comment' ) ); ?>
</ol>
<?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
<div class="navigation">
<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-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
</div>
<?php endif; // check for comment navigation ?>
@ -42,11 +42,11 @@
<?php else : // if comments are closed ?>
<p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
<?php endif; ?>
<?php endif; ?>
<?php comment_form(); ?>
</div><!-- #comments -->
</div><!-- #comments -->

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

@ -6,11 +6,11 @@
<?php get_sidebar( 'footer' ); ?>
<div id="site-info">
<a href="<?php echo home_url('/') ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
<a href="<?php echo home_url( '/' ) ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</div>
<div id="site-generator">
<?php printf( __('Proudly powered by <span id="generator-link">%s</span>.', 'twentyten'), '<a href="http://wordpress.org/" title="' . esc_attr__( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
<?php printf( __( 'Proudly powered by <span id="generator-link">%s</span>.', 'twentyten' ), '<a href="http://wordpress.org/" title="' . esc_attr__( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
</div>
</div><!-- #colophon -->

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

@ -8,8 +8,8 @@ if ( ! function_exists( 'twentyten_init' ) ) :
function twentyten_init() {
// Your Changeable header business starts here
// No CSS, just IMG call
define( 'HEADER_TEXTCOLOR', '');
define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg'); // %s is theme dir uri
define( 'HEADER_TEXTCOLOR', '' );
define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg' ); // %s is theme dir uri
define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
define( 'NO_HEADER_TEXT', true );
@ -17,14 +17,48 @@ function twentyten_init() {
add_custom_image_header( '', 'twentyten_admin_header_style' );
// and thus ends the changeable header business
register_default_headers( array('berries' => array('url' => '%s/images/headers/berries.jpg', 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg', 'description' => __('Berries')),
'cherryblossom' => array( 'url' => '%s/images/headers/cherryblossoms.jpg', 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg', 'description' => __('Cherry Blossoms')),
'concave' => array('url' => '%s/images/headers/concave.jpg', 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg', 'description' => __('Concave')),
'fern' => array('url' => '%s/images/headers/fern.jpg', 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg', 'description' => __('Fern')),
'forestfloor' => array('url' => '%s/images/headers/forestfloor.jpg', 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg', 'description' => __('Forest Floor')),
'inkwell' => array('url' => '%s/images/headers/inkwell.jpg', 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg', 'description' => __('Ink Well')),
'path' => array('url' => '%s/images/headers/path.jpg', 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg', 'description' => __('Path')),
'sunset' => array('url' => '%s/images/headers/sunset.jpg', 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg', 'description' => __('Sunset')) ) );
register_default_headers( array (
'berries' => array (
'url' => '%s/images/headers/berries.jpg',
'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
'description' => __( 'Berries' )
),
'cherryblossom' => array (
'url' => '%s/images/headers/cherryblossoms.jpg',
'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
'description' => __( 'Cherry Blossoms' )
),
'concave' => array (
'url' => '%s/images/headers/concave.jpg',
'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
'description' => __( 'Concave' )
),
'fern' => array (
'url' => '%s/images/headers/fern.jpg',
'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
'description' => __( 'Fern' )
),
'forestfloor' => array (
'url' => '%s/images/headers/forestfloor.jpg',
'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
'description' => __( 'Forest Floor' )
),
'inkwell' => array (
'url' => '%s/images/headers/inkwell.jpg',
'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
'description' => __( 'Ink Well' )
),
'path' => array (
'url' => '%s/images/headers/path.jpg',
'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
'description' => __( 'Path' )
),
'sunset' => array (
'url' => '%s/images/headers/sunset.jpg',
'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
'description' => __( 'Sunset' )
)
) );
add_custom_background();
@ -75,8 +109,8 @@ endif;
// Get the page number
if ( ! function_exists( 'twentyten_get_page_number' ) ) :
function twentyten_get_page_number() {
if ( get_query_var('paged') )
return ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
if ( get_query_var( 'paged' ) )
return ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var( 'paged' );
}
endif;
@ -98,7 +132,7 @@ add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
// Make a nice read more link on excerpts
if ( ! function_exists( 'twentyten_excerpt_more' ) ) :
function twentyten_excerpt_more($more) {
function twentyten_excerpt_more( $more ) {
return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
}
endif;
@ -121,7 +155,7 @@ function twentyten_comment( $comment, $args, $depth ) {
<br />
<?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)', 'twentyten' ),' ','' ); ?></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>
@ -147,27 +181,27 @@ add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
if ( ! function_exists( 'twentyten_cat_list' ) ) :
function twentyten_cat_list() {
return twentyten_term_list('category', ', ', __('Posted in %s', 'twentyten'), __('Also posted in %s', 'twentyten') );
return twentyten_term_list( 'category', ', ', __( 'Posted in %s', 'twentyten' ), __( 'Also posted in %s', 'twentyten' ) );
}
endif;
if ( ! function_exists( 'twentyten_tag_list' ) ) :
function twentyten_tag_list() {
return twentyten_term_list('post_tag', ', ', __('Tagged %s', 'twentyten'), __('Also tagged %s', 'twentyten') );
return twentyten_term_list( 'post_tag', ', ', __( 'Tagged %s', 'twentyten' ), __( 'Also tagged %s', 'twentyten' ) );
}
endif;
if ( ! function_exists( 'twentyten_term_list' ) ) :
function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '') {
function twentyten_term_list( $taxonomy, $glue = ', ', $text = '', $also_text = '' ) {
global $wp_query, $post;
$current_term = $wp_query->get_queried_object();
$terms = wp_get_object_terms($post->ID, $taxonomy);
$terms = wp_get_object_terms( $post->ID, $taxonomy );
// If we're viewing a Taxonomy page..
if ( isset($current_term->taxonomy) && $taxonomy == $current_term->taxonomy ) {
if ( isset( $current_term->taxonomy ) && $taxonomy == $current_term->taxonomy ) {
// Remove the term from display.
foreach ( (array)$terms as $key => $term ) {
foreach ( (array) $terms as $key => $term ) {
if ( $term->term_id == $current_term->term_id ) {
unset($terms[$key]);
unset( $terms[$key] );
break;
}
}
@ -176,11 +210,11 @@ function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '
}
$tlist = array();
$rel = 'category' == $taxonomy ? 'rel="category"' : 'rel="tag"';
foreach ( (array)$terms as $term ) {
foreach ( (array) $terms as $term ) {
$tlist[] = '<a href="' . get_term_link( $term, $taxonomy ) . '" title="' . esc_attr( sprintf( __( 'View all posts in %s', 'twentyten' ), $term->name ) ) . '" ' . $rel . '>' . $term->name . '</a>';
}
if ( !empty($tlist) )
return sprintf($text, join($glue, $tlist));
if ( ! empty( $tlist ) )
return sprintf( $text, join( $glue, $tlist ) );
return '';
}
endif;

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

@ -1,25 +1,25 @@
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo('charset'); ?>" />
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<title><?php
if ( is_single() ) {
single_post_title(); echo ' | '; bloginfo('name');
single_post_title(); echo ' | '; bloginfo( 'name' );
} elseif ( is_home() || is_front_page() ) {
bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();
bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number();
} elseif ( is_page() ) {
single_post_title(''); echo ' | '; bloginfo('name');
single_post_title( '' ); echo ' | '; bloginfo( 'name' );
} elseif ( is_search() ) {
printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_the_page_number(); echo ' | '; bloginfo('name');
printf( __( 'Search results for "%s"', 'twentyten' ), esc_html( $s ) ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
} elseif ( is_404() ) {
_e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
_e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
} else {
wp_title(''); echo ' | '; bloginfo('name'); twentyten_the_page_number();
wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
}
?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" />
<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory' ); ?>/print.css" />
<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<?php wp_head(); ?>
@ -30,15 +30,15 @@
<div id="header">
<div id="masthead">
<div id="branding">
<div id="site-title"><span><a href="<?php echo home_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 echo 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>
<?php
if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
if ( is_singular() && has_post_thumbnail( $post->ID ) ) :
echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
} else { ?>
else : ?>
<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
<?php } ?>
<?php endif; ?>
</div><!-- #branding -->
<div id="access">

40
wp-content/themes/twentyten/loop.php
View File

@ -1,7 +1,7 @@
<?php if ( $wp_query->max_num_pages > 1 ) : ?>
<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-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', '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><!-- #nav-above -->
<?php endif; ?>
@ -18,15 +18,15 @@
<?php while ( have_posts() ) : the_post(); ?>
<?php if ( in_category( 'Gallery' ) ) : ?>
<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>
<div class="entry-meta">
<?php
printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
get_permalink(),
esc_attr( get_the_time() ),
get_the_date(),
get_author_posts_url( get_the_author_meta('ID') ),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
get_the_author()
);
@ -36,14 +36,14 @@
<div class="entry-content">
<div class="gallery-thumb">
<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
$images = get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
$total_images = count($images);
$image = array_shift($images);
$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
$total_images = count( $images );
$image = array_shift( $images );
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"',
<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>
@ -55,7 +55,7 @@
$category_id = get_cat_ID( 'Gallery' );
$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"> | </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" ); ?>
@ -77,11 +77,11 @@
<div class="entry-utility">
<?php
printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
get_permalink(),
esc_attr( get_the_time() ),
get_the_date(),
get_author_posts_url( get_the_author_meta('ID') ),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
get_the_author()
);
@ -95,15 +95,15 @@
<?php else : ?>
<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>
<div class="entry-meta">
<?php
printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
get_permalink(),
esc_attr( get_the_time() ),
get_the_date(),
get_author_posts_url( get_the_author_meta('ID') ),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
get_the_author()
);
@ -125,7 +125,7 @@
<span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
<span class="meta-sep"> | </span>
<?php $tags_text = twentyten_tag_list(); ?>
<?php if ( !empty($tags_text) ) : ?>
<?php if ( ! empty( $tags_text ) ) : ?>
<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
<span class="meta-sep"> | </span>
<?php endif; //$tags_text ?>
@ -141,7 +141,7 @@
<?php if ( $wp_query->max_num_pages > 1 ) : ?>
<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-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', '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><!-- #nav-below -->
<?php endif; ?>
<?php endif; ?>

4
wp-content/themes/twentyten/onecolumn-page.php
View File

@ -15,7 +15,7 @@ get_header(); ?>
<h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-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>' ); ?>
</div><!-- .entry-content -->
</div><!-- #post-<?php the_ID(); ?> -->
@ -25,4 +25,4 @@ get_header(); ?>
</div><!-- #content -->
</div><!-- #container -->
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -9,7 +9,7 @@
<h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-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>' ); ?>
</div><!-- .entry-content -->
</div><!-- #post-<?php the_ID(); ?> -->
@ -20,4 +20,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -4,7 +4,7 @@
<div id="content">
<?php if ( have_posts() ) : ?>
<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>'); ?></h1>
<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
<?php get_generic_template( 'loop', 'search' ); ?>
<?php else : ?>
<div id="post-0" class="post no-results not-found">
@ -19,4 +19,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

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

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

@ -1,6 +1,6 @@
<div id="primary" class="widget-area">
<ul class="xoxo">
<?php if ( !dynamic_sidebar('primary-widget-area') ) : // begin primary widget area ?>
<?php if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : // begin primary widget area ?>
<li id="search" class="widget-container widget_search">
<?php get_search_form(); ?>
</li>
@ -24,10 +24,10 @@
</ul>
</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">
<ul class="xoxo">
<?php dynamic_sidebar( 'secondary-widget-area' ); ?>
</ul>
</div><!-- #secondary .widget-area -->
<?php endif; ?>
<?php endif; ?>

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

@ -15,7 +15,7 @@
<div class="entry-meta">
<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( get_the_author_meta('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( get_the_author_meta( 'ID' ) ); ?>" 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>
<a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" 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" ); ?>
@ -26,16 +26,16 @@
<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</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="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 id="author-description">
<h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
<?php the_author_meta('description'); ?>
<?php the_author_meta( 'description' ); ?>
<div id="author-link">
<a href="<?php echo get_author_posts_url( get_the_author_meta('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>
<a href="<?php echo get_author_posts_url( get_the_author_meta( '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-description -->
</div><!-- .entry-author-info -->
@ -51,10 +51,10 @@
}
printf(
$utility_text,
get_the_category_list(', '),
get_the_category_list( ', ' ),
$tag_list,
get_permalink(),
the_title_attribute('echo=0'),
the_title_attribute( 'echo=0' ),
get_post_comments_feed_link()
);
?>
@ -74,4 +74,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>

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

@ -6,7 +6,7 @@
<?php the_post(); ?>
<h1 class="page-title"><?php
printf(__( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title('', false) . '</span>');
printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
?></h1>
<?php rewind_posts(); ?>
@ -17,4 +17,4 @@
</div><!-- #container -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php get_footer(); ?>