Use get_template_part() for single.php, attachment.php, page.php, and our page template in Twenty Ten. Introduces loop-page/single/attachment.php. props koopersmith, fixes #15078.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
parent
b5e9c9c703
commit
e4d81b8e9a
|
|
@ -1,16 +1,19 @@
|
|||
<?php
|
||||
/**
|
||||
* The template for displaying attachments.
|
||||
* The loop that displays an attachment.
|
||||
*
|
||||
* The loop displays the posts and the post content. See
|
||||
* http://codex.wordpress.org/The_Loop to understand it and
|
||||
* http://codex.wordpress.org/Template_Tags to understand
|
||||
* the tags used in it.
|
||||
*
|
||||
* This can be overridden in child themes with loop-attachment.php.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Twenty_Ten
|
||||
* @since Twenty Ten 1.0
|
||||
* @since Twenty Ten 1.2
|
||||
*/
|
||||
|
||||
get_header(); ?>
|
||||
|
||||
<div id="container" class="single-attachment">
|
||||
<div id="content" role="main">
|
||||
?>
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
|
|
@ -110,9 +113,4 @@ get_header(); ?>
|
|||
|
||||
<?php comments_template(); ?>
|
||||
|
||||
<?php endwhile; ?>
|
||||
|
||||
</div><!-- #content -->
|
||||
</div><!-- #container -->
|
||||
|
||||
<?php get_footer(); ?>
|
||||
<?php endwhile; // end of the loop. ?>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
/**
|
||||
* The loop that displays a page.
|
||||
*
|
||||
* The loop displays the posts and the post content. See
|
||||
* http://codex.wordpress.org/The_Loop to understand it and
|
||||
* http://codex.wordpress.org/Template_Tags to understand
|
||||
* the tags used in it.
|
||||
*
|
||||
* This can be overridden in child themes with loop-page.php.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Twenty_Ten
|
||||
* @since Twenty Ten 1.2
|
||||
*/
|
||||
?>
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<?php if ( is_front_page() ) { ?>
|
||||
<h2 class="entry-title"><?php the_title(); ?></h2>
|
||||
<?php } else { ?>
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
<?php } ?>
|
||||
|
||||
<div class="entry-content">
|
||||
<?php the_content(); ?>
|
||||
<?php wp_link_pages( array( '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 comments_template( '', true ); ?>
|
||||
|
||||
<?php endwhile; // end of the loop. ?>
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
<?php
|
||||
/**
|
||||
* The loop that displays a single post.
|
||||
*
|
||||
* The loop displays the posts and the post content. See
|
||||
* http://codex.wordpress.org/The_Loop to understand it and
|
||||
* http://codex.wordpress.org/Template_Tags to understand
|
||||
* the tags used in it.
|
||||
*
|
||||
* This can be overridden in child themes with loop-single.php.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Twenty_Ten
|
||||
* @since Twenty Ten 1.2
|
||||
*/
|
||||
?>
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<div id="nav-above" class="navigation">
|
||||
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
|
||||
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
|
||||
</div><!-- #nav-above -->
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
|
||||
<div class="entry-meta">
|
||||
<?php twentyten_posted_on(); ?>
|
||||
</div><!-- .entry-meta -->
|
||||
|
||||
<div class="entry-content">
|
||||
<?php the_content(); ?>
|
||||
<?php wp_link_pages( array( '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 description, 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 ) ); ?>
|
||||
</div><!-- #author-avatar -->
|
||||
<div id="author-description">
|
||||
<h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
|
||||
<?php the_author_meta( 'description' ); ?>
|
||||
<div id="author-link">
|
||||
<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
|
||||
<?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'twentyten' ), get_the_author() ); ?>
|
||||
</a>
|
||||
</div><!-- #author-link -->
|
||||
</div><!-- #author-description -->
|
||||
</div><!-- #entry-author-info -->
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="entry-utility">
|
||||
<?php twentyten_posted_in(); ?>
|
||||
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
|
||||
</div><!-- .entry-utility -->
|
||||
</div><!-- #post-## -->
|
||||
|
||||
<div id="nav-below" class="navigation">
|
||||
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
|
||||
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
|
||||
</div><!-- #nav-below -->
|
||||
|
||||
<?php comments_template( '', true ); ?>
|
||||
|
||||
<?php endwhile; // end of the loop. ?>
|
||||
|
|
@ -17,20 +17,13 @@ get_header(); ?>
|
|||
<div id="container" class="one-column">
|
||||
<div id="content" role="main">
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
<div class="entry-content">
|
||||
<?php the_content(); ?>
|
||||
<?php wp_link_pages( array( '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 comments_template( '', true ); ?>
|
||||
|
||||
<?php endwhile; ?>
|
||||
<?php
|
||||
/* Run the loop to output the page.
|
||||
* If you want to overload this in a child theme then include a file
|
||||
* called loop-page.php and that will be used instead.
|
||||
*/
|
||||
get_template_part( 'loop', 'page' );
|
||||
?>
|
||||
|
||||
</div><!-- #content -->
|
||||
</div><!-- #container -->
|
||||
|
|
|
|||
|
|
@ -17,25 +17,13 @@ get_header(); ?>
|
|||
<div id="container">
|
||||
<div id="content" role="main">
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<?php if ( is_front_page() ) { ?>
|
||||
<h2 class="entry-title"><?php the_title(); ?></h2>
|
||||
<?php } else { ?>
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
<?php } ?>
|
||||
|
||||
<div class="entry-content">
|
||||
<?php the_content(); ?>
|
||||
<?php wp_link_pages( array( '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 comments_template( '', true ); ?>
|
||||
|
||||
<?php endwhile; ?>
|
||||
<?php
|
||||
/* Run the loop to output the page.
|
||||
* If you want to overload this in a child theme then include a file
|
||||
* called loop-page.php and that will be used instead.
|
||||
*/
|
||||
get_template_part( 'loop', 'page' );
|
||||
?>
|
||||
|
||||
</div><!-- #content -->
|
||||
</div><!-- #container -->
|
||||
|
|
|
|||
|
|
@ -12,56 +12,13 @@ get_header(); ?>
|
|||
<div id="container">
|
||||
<div id="content" role="main">
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<div id="nav-above" class="navigation">
|
||||
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
|
||||
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
|
||||
</div><!-- #nav-above -->
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
|
||||
<div class="entry-meta">
|
||||
<?php twentyten_posted_on(); ?>
|
||||
</div><!-- .entry-meta -->
|
||||
|
||||
<div class="entry-content">
|
||||
<?php the_content(); ?>
|
||||
<?php wp_link_pages( array( '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 description, 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 ) ); ?>
|
||||
</div><!-- #author-avatar -->
|
||||
<div id="author-description">
|
||||
<h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
|
||||
<?php the_author_meta( 'description' ); ?>
|
||||
<div id="author-link">
|
||||
<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
|
||||
<?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'twentyten' ), get_the_author() ); ?>
|
||||
</a>
|
||||
</div><!-- #author-link -->
|
||||
</div><!-- #author-description -->
|
||||
</div><!-- #entry-author-info -->
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="entry-utility">
|
||||
<?php twentyten_posted_in(); ?>
|
||||
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
|
||||
</div><!-- .entry-utility -->
|
||||
</div><!-- #post-## -->
|
||||
|
||||
<div id="nav-below" class="navigation">
|
||||
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
|
||||
<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
|
||||
</div><!-- #nav-below -->
|
||||
|
||||
<?php comments_template( '', true ); ?>
|
||||
|
||||
<?php endwhile; // end of the loop. ?>
|
||||
<?php
|
||||
/* Run the loop to output the post.
|
||||
* If you want to overload this in a child theme then include a file
|
||||
* called loop-single.php and that will be used instead.
|
||||
*/
|
||||
get_template_part( 'loop', 'single' );
|
||||
?>
|
||||
|
||||
</div><!-- #content -->
|
||||
</div><!-- #container -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue