Twenty Ten code cleanups. props lancewillett, fixes #15476.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
parent
8233e4f6b5
commit
27cb70434a
|
|
@ -32,9 +32,9 @@ get_header(); ?>
|
|||
<?php if ( is_day() ) : ?>
|
||||
<?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
|
||||
<?php elseif ( is_month() ) : ?>
|
||||
<?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?>
|
||||
<?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date( 'F Y' ) ); ?>
|
||||
<?php elseif ( is_year() ) : ?>
|
||||
<?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?>
|
||||
<?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date( 'Y' ) ); ?>
|
||||
<?php else : ?>
|
||||
<?php _e( 'Blog Archives', 'twentyten' ); ?>
|
||||
<?php endif; ?>
|
||||
|
|
|
|||
|
|
@ -23,17 +23,14 @@
|
|||
?>
|
||||
|
||||
<div id="site-info">
|
||||
<a href="<?php echo home_url( '/' ) ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
|
||||
<a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
|
||||
<?php bloginfo( 'name' ); ?>
|
||||
</a>
|
||||
</div><!-- #site-info -->
|
||||
|
||||
<div id="site-generator">
|
||||
<?php do_action( 'twentyten_credits' ); ?>
|
||||
<a href="<?php echo esc_url( __('http://wordpress.org/', 'twentyten') ); ?>"
|
||||
title="<?php esc_attr_e('Semantic Personal Publishing Platform', 'twentyten'); ?>" rel="generator">
|
||||
<?php printf( __('Proudly powered by %s.', 'twentyten'), 'WordPress' ); ?>
|
||||
</a>
|
||||
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentyten' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
|
||||
</div><!-- #site-generator -->
|
||||
|
||||
</div><!-- #colophon -->
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ function twentyten_comment( $comment, $args, $depth ) {
|
|||
case 'trackback' :
|
||||
?>
|
||||
<li class="post pingback">
|
||||
<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'twentyten'), ' ' ); ?></p>
|
||||
<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
|
||||
<?php
|
||||
break;
|
||||
endswitch;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* This is the most generic template file in a WordPress theme
|
||||
* and one of the two required files for a theme (the other being style.css).
|
||||
* It is used to display a page when nothing more specific matches a query.
|
||||
* It is used to display a page when nothing more specific matches a query.
|
||||
* E.g., it puts together the home page when no home.php file exists.
|
||||
* Learn more: http://codex.wordpress.org/Template_Hierarchy
|
||||
*
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
<div class="entry-meta">
|
||||
<?php
|
||||
printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
|
||||
printf( __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
|
||||
'meta-prep meta-prep-author',
|
||||
sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
|
||||
get_author_posts_url( get_the_author_meta( 'ID' ) ),
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
?>
|
||||
<span class="meta-sep">|</span>
|
||||
<?php
|
||||
printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
|
||||
printf( __( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
|
||||
'meta-prep meta-prep-entry-date',
|
||||
sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
|
||||
esc_attr( get_the_time() ),
|
||||
|
|
@ -50,10 +50,10 @@
|
|||
if ( wp_attachment_is_image() ) {
|
||||
echo ' <span class="meta-sep">|</span> ';
|
||||
$metadata = wp_get_attachment_metadata();
|
||||
printf( __( 'Full size is %s pixels', 'twentyten'),
|
||||
printf( __( 'Full size is %s pixels', 'twentyten' ),
|
||||
sprintf( '<a href="%1$s" title="%2$s">%3$s × %4$s</a>',
|
||||
wp_get_attachment_url(),
|
||||
esc_attr( __('Link to full-size image', 'twentyten') ),
|
||||
esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
|
||||
$metadata['width'],
|
||||
$metadata['height']
|
||||
)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
<?php /* How to display posts in the Gallery category. */ ?>
|
||||
|
||||
<?php if ( in_category( _x('gallery', 'gallery category slug', 'twentyten') ) || 'gallery' == get_post_format( $post->ID ) ) : ?>
|
||||
<?php if ( in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) || 'gallery' == get_post_format( $post->ID ) ) : ?>
|
||||
<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>
|
||||
|
||||
|
|
@ -68,8 +68,8 @@
|
|||
<div class="entry-content">
|
||||
<?php if ( post_password_required() ) : ?>
|
||||
<?php the_content(); ?>
|
||||
<?php else : ?>
|
||||
<?php
|
||||
<?php else : ?>
|
||||
<?php
|
||||
$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
|
||||
if ( $images ) :
|
||||
$total_images = count( $images );
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
</div><!-- .entry-content -->
|
||||
|
||||
<div class="entry-utility">
|
||||
<a href="<?php echo get_term_link( _x('gallery', 'gallery category slug', 'twentyten'), 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
|
||||
<a href="<?php echo get_term_link( _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ); ?>" 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> <span class="edit-link">', '</span>' ); ?>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
|
||||
<?php /* How to display posts in the asides category */ ?>
|
||||
|
||||
<?php elseif ( in_category( _x('asides', 'asides category slug', 'twentyten') ) || 'aside' == get_post_format( $post->ID ) ) : ?>
|
||||
<?php elseif ( in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) || 'aside' == get_post_format( $post->ID ) ) : ?>
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
|
||||
<?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ input[type=submit] {
|
|||
-------------------------------------------------------------- */
|
||||
|
||||
/* Text elements */
|
||||
ul {
|
||||
ul, ol {
|
||||
margin: 0 1.5em 18px 0;
|
||||
}
|
||||
blockquote {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* some default sidebar stuff just in case.
|
||||
*/
|
||||
if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
|
||||
|
||||
|
||||
<li id="search" class="widget-container widget_search">
|
||||
<?php get_search_form(); ?>
|
||||
</li>
|
||||
|
|
|
|||
Loading…
Reference in New Issue