Changeset 13720
- Timestamp:
- 03/16/2010 08:17:22 PM (13 years ago)
- Location:
- trunk/wp-content/themes/twentyten
- Files:
-
- 15 edited
-
attachment.php (modified) (6 diffs)
-
author.php (modified) (1 diff)
-
category.php (modified) (1 diff)
-
comments.php (modified) (2 diffs)
-
footer.php (modified) (1 diff)
-
functions.php (modified) (8 diffs)
-
header.php (modified) (2 diffs)
-
loop.php (modified) (8 diffs)
-
onecolumn-page.php (modified) (1 diff)
-
page.php (modified) (1 diff)
-
search.php (modified) (1 diff)
-
sidebar-footer.php (modified) (4 diffs)
-
sidebar.php (modified) (2 diffs)
-
single.php (modified) (3 diffs)
-
tag.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-content/themes/twentyten/attachment.php
r13498 r13720 6 6 <?php the_post(); ?> 7 7 8 <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent); ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ); ?>" rel="gallery">← <?php echo get_the_title($post->post_parent); ?></a></p>8 <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title( $post->post_parent ), 1 ) ); ?>" rel="gallery">← <?php echo get_the_title( $post->post_parent ); ?></a></p> 9 9 10 10 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> … … 14 14 <?php 15 15 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'), 16 get_author_posts_url( get_the_author_meta( 'ID') ),16 get_author_posts_url( get_the_author_meta( 'ID' ) ), 17 17 sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), 18 18 get_the_author() … … 22 22 <?php 23 23 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'), 24 esc_attr( get_the_time()),24 esc_attr( get_the_time() ), 25 25 get_the_date() 26 26 ); … … 44 44 <?php endif; ?> 45 45 </div> 46 <div class="entry-caption"><?php if ( ! empty($post->post_excerpt) ) the_excerpt(); ?></div>46 <div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt(); ?></div> 47 47 48 48 <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?> … … 61 61 printf( 62 62 $utility_text, 63 get_the_category_list( ', '),63 get_the_category_list( ', ' ), 64 64 $tag_list, 65 65 get_permalink(), 66 the_title_attribute( 'echo=0'),66 the_title_attribute( 'echo=0' ), 67 67 get_post_comments_feed_link() 68 68 ); … … 71 71 <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?> 72 72 <?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() ); ?> 73 <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>73 <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?> 74 74 <?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() ); ?> 75 <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>75 <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?> 76 76 <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?> 77 <?php elseif ( ! comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>77 <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?> 78 78 <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?> 79 79 <?php endif; ?> -
trunk/wp-content/themes/twentyten/author.php
r13147 r13720 6 6 <?php the_post(); ?> 7 7 8 <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>8 <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> 9 9 10 <?php if ( get_the_author_meta( 'description') ) : // If a user has filled out their decscription show a bio on their entries ?>10 <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their decscription show a bio on their entries ?> 11 11 <div id="entry-author-info"> 12 12 <div id="author-avatar"> 13 <?php echo get_avatar( get_the_author_meta( 'user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>13 <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?> 14 14 </div><!-- #author-avatar --> 15 15 <div id="author-description"> 16 <h2><?php printf( __('About %s', 'twentyten'), get_the_author()); ?></h2>17 <?php the_author_meta( 'description'); ?>16 <h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2> 17 <?php the_author_meta( 'description' ); ?> 18 18 </div><!-- #author-description --> 19 19 </div><!-- .entry-author-info --> -
trunk/wp-content/themes/twentyten/category.php
r13498 r13720 5 5 6 6 <h1 class="page-title"><?php 7 printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title('', false) . '</span>');7 printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' ); 8 8 ?></h1> 9 <?php $categorydesc = category_description(); if ( ! empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>9 <?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?> 10 10 11 11 <?php get_generic_template( 'loop', 'category' ); ?> -
trunk/wp-content/themes/twentyten/comments.php
r13498 r13720 14 14 <?php if ( have_comments() ) : ?> 15 15 <h3 id="comments-title"><?php comments_number( 16 sprintf( __('No Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),17 sprintf( __('One Response to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),18 sprintf( __('%% Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>')16 sprintf( __( 'No Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ), 17 sprintf( __( 'One Response to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ), 18 sprintf( __( '%% Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ) 19 19 ); ?> </h3> 20 20 21 21 <?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?> 22 22 <div class="navigation"> 23 <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyten') ); ?></div>24 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyten') ); ?></div>23 <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyten' ) ); ?></div> 24 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyten' ) ); ?></div> 25 25 </div> 26 26 <?php endif; // check for comment navigation ?> 27 27 28 28 <ol class="commentlist"> 29 <?php wp_list_comments( array( 'callback' => 'twentyten_comment') ); ?>29 <?php wp_list_comments( array( 'callback' => 'twentyten_comment' ) ); ?> 30 30 </ol> 31 31 32 32 <?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?> 33 33 <div class="navigation"> 34 <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyten') ); ?></div>35 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyten') ); ?></div>34 <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyten' ) ); ?></div> 35 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyten' ) ); ?></div> 36 36 </div> 37 37 <?php endif; // check for comment navigation ?> … … 43 43 <?php else : // if comments are closed ?> 44 44 45 <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten'); ?></p>45 <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p> 46 46 47 47 <?php endif; ?> -
trunk/wp-content/themes/twentyten/footer.php
r13141 r13720 7 7 8 8 <div id="site-info"> 9 <a href="<?php echo home_url( '/') ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>9 <a href="<?php echo home_url( '/' ) ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a> 10 10 </div> 11 11 12 12 <div id="site-generator"> 13 <?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>' ); ?>13 <?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>' ); ?> 14 14 </div> 15 15 -
trunk/wp-content/themes/twentyten/functions.php
r13552 r13720 9 9 // Your Changeable header business starts here 10 10 // No CSS, just IMG call 11 define( 'HEADER_TEXTCOLOR', '' );12 define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg' ); // %s is theme dir uri11 define( 'HEADER_TEXTCOLOR', '' ); 12 define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg' ); // %s is theme dir uri 13 13 define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) ); 14 14 define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) ); … … 18 18 // and thus ends the changeable header business 19 19 20 register_default_headers( array('berries' => array('url' => '%s/images/headers/berries.jpg', 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg', 'description' => __('Berries')), 21 'cherryblossom' => array( 'url' => '%s/images/headers/cherryblossoms.jpg', 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg', 'description' => __('Cherry Blossoms')), 22 'concave' => array('url' => '%s/images/headers/concave.jpg', 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg', 'description' => __('Concave')), 23 'fern' => array('url' => '%s/images/headers/fern.jpg', 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg', 'description' => __('Fern')), 24 'forestfloor' => array('url' => '%s/images/headers/forestfloor.jpg', 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg', 'description' => __('Forest Floor')), 25 'inkwell' => array('url' => '%s/images/headers/inkwell.jpg', 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg', 'description' => __('Ink Well')), 26 'path' => array('url' => '%s/images/headers/path.jpg', 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg', 'description' => __('Path')), 27 'sunset' => array('url' => '%s/images/headers/sunset.jpg', 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg', 'description' => __('Sunset')) ) ); 20 register_default_headers( array ( 21 'berries' => array ( 22 'url' => '%s/images/headers/berries.jpg', 23 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg', 24 'description' => __( 'Berries' ) 25 ), 26 'cherryblossom' => array ( 27 'url' => '%s/images/headers/cherryblossoms.jpg', 28 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg', 29 'description' => __( 'Cherry Blossoms' ) 30 ), 31 'concave' => array ( 32 'url' => '%s/images/headers/concave.jpg', 33 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg', 34 'description' => __( 'Concave' ) 35 ), 36 'fern' => array ( 37 'url' => '%s/images/headers/fern.jpg', 38 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg', 39 'description' => __( 'Fern' ) 40 ), 41 'forestfloor' => array ( 42 'url' => '%s/images/headers/forestfloor.jpg', 43 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg', 44 'description' => __( 'Forest Floor' ) 45 ), 46 'inkwell' => array ( 47 'url' => '%s/images/headers/inkwell.jpg', 48 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg', 49 'description' => __( 'Ink Well' ) 50 ), 51 'path' => array ( 52 'url' => '%s/images/headers/path.jpg', 53 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg', 54 'description' => __( 'Path' ) 55 ), 56 'sunset' => array ( 57 'url' => '%s/images/headers/sunset.jpg', 58 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg', 59 'description' => __( 'Sunset' ) 60 ) 61 ) ); 28 62 29 63 add_custom_background(); … … 76 110 if ( ! function_exists( 'twentyten_get_page_number' ) ) : 77 111 function twentyten_get_page_number() { 78 if ( get_query_var( 'paged') )79 return ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');112 if ( get_query_var( 'paged' ) ) 113 return ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var( 'paged' ); 80 114 } 81 115 endif; … … 99 133 // Make a nice read more link on excerpts 100 134 if ( ! function_exists( 'twentyten_excerpt_more' ) ) : 101 function twentyten_excerpt_more( $more) {135 function twentyten_excerpt_more( $more ) { 102 136 return ' … <a href="'. get_permalink() . '">' . 'Continue reading <span class="meta-nav">→</span>' . '</a>'; 103 137 } … … 122 156 <?php endif; ?> 123 157 124 <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(), 158 <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> 125 159 126 160 <div class="comment-body"><?php comment_text(); ?></div> … … 148 182 if ( ! function_exists( 'twentyten_cat_list' ) ) : 149 183 function twentyten_cat_list() { 150 return twentyten_term_list( 'category', ', ', __('Posted in %s', 'twentyten'), __('Also posted in %s', 'twentyten') );184 return twentyten_term_list( 'category', ', ', __( 'Posted in %s', 'twentyten' ), __( 'Also posted in %s', 'twentyten' ) ); 151 185 } 152 186 endif; … … 154 188 if ( ! function_exists( 'twentyten_tag_list' ) ) : 155 189 function twentyten_tag_list() { 156 return twentyten_term_list( 'post_tag', ', ', __('Tagged %s', 'twentyten'), __('Also tagged %s', 'twentyten') );190 return twentyten_term_list( 'post_tag', ', ', __( 'Tagged %s', 'twentyten' ), __( 'Also tagged %s', 'twentyten' ) ); 157 191 } 158 192 endif; 159 193 160 194 if ( ! function_exists( 'twentyten_term_list' ) ) : 161 function twentyten_term_list( $taxonomy, $glue = ', ', $text = '', $also_text = '') {195 function twentyten_term_list( $taxonomy, $glue = ', ', $text = '', $also_text = '' ) { 162 196 global $wp_query, $post; 163 197 $current_term = $wp_query->get_queried_object(); 164 $terms = wp_get_object_terms( $post->ID, $taxonomy);198 $terms = wp_get_object_terms( $post->ID, $taxonomy ); 165 199 // If we're viewing a Taxonomy page.. 166 if ( isset( $current_term->taxonomy) && $taxonomy == $current_term->taxonomy ) {200 if ( isset( $current_term->taxonomy ) && $taxonomy == $current_term->taxonomy ) { 167 201 // Remove the term from display. 168 foreach ( (array) $terms as $key => $term ) {202 foreach ( (array) $terms as $key => $term ) { 169 203 if ( $term->term_id == $current_term->term_id ) { 170 unset( $terms[$key]);204 unset( $terms[$key] ); 171 205 break; 172 206 } … … 177 211 $tlist = array(); 178 212 $rel = 'category' == $taxonomy ? 'rel="category"' : 'rel="tag"'; 179 foreach ( (array) $terms as $term ) {213 foreach ( (array) $terms as $term ) { 180 214 $tlist[] = '<a href="' . get_term_link( $term, $taxonomy ) . '" title="' . esc_attr( sprintf( __( 'View all posts in %s', 'twentyten' ), $term->name ) ) . '" ' . $rel . '>' . $term->name . '</a>'; 181 215 } 182 if ( ! empty($tlist) )183 return sprintf( $text, join($glue, $tlist));216 if ( ! empty( $tlist ) ) 217 return sprintf( $text, join( $glue, $tlist ) ); 184 218 return ''; 185 219 } -
trunk/wp-content/themes/twentyten/header.php
r13704 r13720 2 2 <html <?php language_attributes(); ?>> 3 3 <head> 4 <meta charset="<?php bloginfo( 'charset'); ?>" />4 <meta charset="<?php bloginfo( 'charset' ); ?>" /> 5 5 <title><?php 6 6 if ( is_single() ) { 7 single_post_title(); echo ' | '; bloginfo( 'name');7 single_post_title(); echo ' | '; bloginfo( 'name' ); 8 8 } elseif ( is_home() || is_front_page() ) { 9 bloginfo( 'name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();9 bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number(); 10 10 } elseif ( is_page() ) { 11 single_post_title( ''); echo ' | '; bloginfo('name');11 single_post_title( '' ); echo ' | '; bloginfo( 'name' ); 12 12 } elseif ( is_search() ) { 13 printf( __('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_the_page_number(); echo ' | '; bloginfo('name');13 printf( __( 'Search results for "%s"', 'twentyten' ), esc_html( $s ) ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' ); 14 14 } elseif ( is_404() ) { 15 _e( 'Not Found', 'twentyten'); echo ' | '; bloginfo('name');15 _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' ); 16 16 } else { 17 wp_title( ''); echo ' | '; bloginfo('name'); twentyten_the_page_number();17 wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number(); 18 18 } 19 19 ?></title> 20 20 <link rel="profile" href="http://gmpg.org/xfn/11" /> 21 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url'); ?>" />22 <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory'); ?>/print.css" />21 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" /> 22 <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory' ); ?>/print.css" /> 23 23 <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?> 24 24 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" /> … … 31 31 <div id="masthead"> 32 32 <div id="branding"> 33 <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>33 <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> 34 34 <div id="site-description"><?php bloginfo( 'description' ); ?></div> 35 35 36 36 <?php 37 if ( is_singular() && has_post_thumbnail( $post->ID ) ) {37 if ( is_singular() && has_post_thumbnail( $post->ID ) ) : 38 38 echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); 39 } else {?>39 else : ?> 40 40 <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" /> 41 <?php }?>41 <?php endif; ?> 42 42 </div><!-- #branding --> 43 43 -
trunk/wp-content/themes/twentyten/loop.php
r13498 r13720 1 1 <?php if ( $wp_query->max_num_pages > 1 ) : ?> 2 2 <div id="nav-above" class="navigation"> 3 <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' )); ?></div>4 <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' )); ?></div>3 <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' ) ); ?></div> 4 <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div> 5 5 </div><!-- #nav-above --> 6 6 <?php endif; ?> … … 19 19 <?php if ( in_category( 'Gallery' ) ) : ?> 20 20 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> 21 <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>21 <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> 22 22 23 23 <div class="entry-meta"> 24 24 <?php 25 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'),25 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' ), 26 26 get_permalink(), 27 27 esc_attr( get_the_time() ), 28 28 get_the_date(), 29 get_author_posts_url( get_the_author_meta( 'ID') ),29 get_author_posts_url( get_the_author_meta( 'ID' ) ), 30 30 sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), 31 31 get_the_author() … … 37 37 <div class="gallery-thumb"> 38 38 <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php 39 $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );40 $total_images = count( $images);41 $image = array_shift( $images);39 $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) ); 40 $total_images = count( $images ); 41 $image = array_shift( $images ); 42 42 echo wp_get_attachment_image( $image->ID, 'thumbnail' ); 43 43 ?></a> 44 44 </div> 45 <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'),46 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"',45 <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ), 46 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"', 47 47 $total_images 48 48 ); ?></em></p> … … 56 56 $category_link = get_category_link( $category_id ); 57 57 ?> 58 <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>58 <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a> 59 59 <span class="meta-sep"> | </span> 60 60 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span> … … 78 78 <div class="entry-utility"> 79 79 <?php 80 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'),80 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' ), 81 81 get_permalink(), 82 82 esc_attr( get_the_time() ), 83 83 get_the_date(), 84 get_author_posts_url( get_the_author_meta( 'ID') ),84 get_author_posts_url( get_the_author_meta( 'ID' ) ), 85 85 sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), 86 86 get_the_author() … … 96 96 <?php else : ?> 97 97 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> 98 <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>98 <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> 99 99 100 100 <div class="entry-meta"> 101 101 <?php 102 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'),102 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' ), 103 103 get_permalink(), 104 104 esc_attr( get_the_time() ), 105 105 get_the_date(), 106 get_author_posts_url( get_the_author_meta( 'ID') ),106 get_author_posts_url( get_the_author_meta( 'ID' ) ), 107 107 sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), 108 108 get_the_author() … … 126 126 <span class="meta-sep"> | </span> 127 127 <?php $tags_text = twentyten_tag_list(); ?> 128 <?php if ( ! empty($tags_text) ) : ?>128 <?php if ( ! empty( $tags_text ) ) : ?> 129 129 <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span> 130 130 <span class="meta-sep"> | </span> … … 142 142 <?php if ( $wp_query->max_num_pages > 1 ) : ?> 143 143 <div id="nav-below" class="navigation"> 144 <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' )); ?></div>145 <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' )); ?></div>144 <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' ) ); ?></div> 145 <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div> 146 146 </div><!-- #nav-below --> 147 147 <?php endif; ?> -
trunk/wp-content/themes/twentyten/onecolumn-page.php
r13255 r13720 16 16 <div class="entry-content"> 17 17 <?php the_content(); ?> 18 <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>18 <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?> 19 19 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?> 20 20 </div><!-- .entry-content --> -
trunk/wp-content/themes/twentyten/page.php
r13128 r13720 10 10 <div class="entry-content"> 11 11 <?php the_content(); ?> 12 <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>12 <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?> 13 13 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?> 14 14 </div><!-- .entry-content --> -
trunk/wp-content/themes/twentyten/search.php
r13498 r13720 5 5 6 6 <?php if ( have_posts() ) : ?> 7 <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>7 <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1> 8 8 <?php get_generic_template( 'loop', 'search' ); ?> 9 9 <?php else : ?> -
trunk/wp-content/themes/twentyten/sidebar-footer.php
r13128 r13720 1 1 <?php 2 if ( is_active_sidebar('first-footer-widget-area') || 3 is_active_sidebar('second-footer-widget-area') || 4 is_active_sidebar('third-footer-widget-area') || 5 is_active_sidebar('fourth-footer-widget-area') ) : 2 if ( 3 is_active_sidebar( 'first-footer-widget-area' ) || 4 is_active_sidebar( 'second-footer-widget-area' ) || 5 is_active_sidebar( 'third-footer-widget-area' ) || 6 is_active_sidebar( 'fourth-footer-widget-area' ) 7 ) : 6 8 ?> 7 9 <div id="footer-widget-area"> 8 <?php if ( is_active_sidebar( 'first-footer-widget-area') ) : ?>10 <?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?> 9 11 <div id="first" class="widget-area"> 10 12 <ul class="xoxo"> … … 14 16 <?php endif; ?> 15 17 16 <?php if ( is_active_sidebar( 'second-footer-widget-area') ) : ?>18 <?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?> 17 19 <div id="second" class="widget-area"> 18 20 <ul class="xoxo"> … … 22 24 <?php endif; ?> 23 25 24 <?php if ( is_active_sidebar( 'third-footer-widget-area') ) : ?>26 <?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?> 25 27 <div id="third" class="widget-area"> 26 28 <ul class="xoxo"> … … 30 32 <?php endif; ?> 31 33 32 <?php if ( is_active_sidebar( 'fourth-footer-widget-area') ) : ?>34 <?php if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?> 33 35 <div id="fourth" class="widget-area"> 34 36 <ul class="xoxo"> -
trunk/wp-content/themes/twentyten/sidebar.php
r13128 r13720 1 1 <div id="primary" class="widget-area"> 2 2 <ul class="xoxo"> 3 <?php if ( ! dynamic_sidebar('primary-widget-area') ) : // begin primary widget area ?>3 <?php if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : // begin primary widget area ?> 4 4 <li id="search" class="widget-container widget_search"> 5 5 <?php get_search_form(); ?> … … 25 25 </div><!-- #primary .widget-area --> 26 26 27 <?php if ( is_active_sidebar( 'secondary-widget-area') ) : // Nothing here by default and design ?>27 <?php if ( is_active_sidebar( 'secondary-widget-area' ) ) : // Nothing here by default and design ?> 28 28 <div id="secondary" class="widget-area"> 29 29 <ul class="xoxo"> -
trunk/wp-content/themes/twentyten/single.php
r13498 r13720 16 16 <div class="entry-meta"> 17 17 <span class="meta-prep meta-prep-author"><?php _e( 'Posted by ', 'twentyten' ); ?></span> 18 <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta( 'ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>18 <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> 19 19 <span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span> 20 20 <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a> … … 27 27 </div><!-- .entry-content --> 28 28 29 <?php if ( get_the_author_meta( 'description') ) : // If a user has filled out their decscription show a bio on their entries ?>29 <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their decscription show a bio on their entries ?> 30 30 <div id="entry-author-info"> 31 31 <div id="author-avatar"> 32 <?php echo get_avatar( get_the_author_meta( 'user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>32 <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?> 33 33 </div><!-- #author-avatar --> 34 34 <div id="author-description"> 35 35 <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2> 36 <?php the_author_meta( 'description'); ?>36 <?php the_author_meta( 'description' ); ?> 37 37 <div id="author-link"> 38 <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(); ?> →</a>38 <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(); ?> →</a> 39 39 </div><!-- #author-link --> 40 40 </div><!-- #author-description --> … … 52 52 printf( 53 53 $utility_text, 54 get_the_category_list( ', '),54 get_the_category_list( ', ' ), 55 55 $tag_list, 56 56 get_permalink(), 57 the_title_attribute( 'echo=0'),57 the_title_attribute( 'echo=0' ), 58 58 get_post_comments_feed_link() 59 59 ); -
trunk/wp-content/themes/twentyten/tag.php
r13498 r13720 7 7 8 8 <h1 class="page-title"><?php 9 printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title('', false) . '</span>');9 printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' ); 10 10 ?></h1> 11 11
Note: See TracChangeset
for help on using the changeset viewer.