Skip to content

Commit

Permalink
Fix roots#720 - Re-organize archives template
Browse files Browse the repository at this point in the history
- Move posts exists check and post navigation to index.php

- templates/content.php now only contains the post that's pulled
in from index.php

- Specific post format templates now properly work
  • Loading branch information
retlehs committed Mar 24, 2013
1 parent 35f5c5b commit b6e4e92
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 37 deletions.
24 changes: 20 additions & 4 deletions index.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
<?php get_template_part('templates/page', 'header'); ?>
<?php
$format = have_posts() ? get_post_format() : false;
get_template_part('templates/content', $format);
?>

<?php if (!have_posts()) : ?>
<div class="alert">
<?php _e('Sorry, no results were found.', 'roots'); ?>
</div>
<?php get_search_form(); ?>
<?php endif; ?>

<?php while (have_posts()) : the_post(); ?>
<?php get_template_part('templates/content', get_post_format()); ?>
<?php endwhile; ?>

<?php if ($wp_query->max_num_pages > 1) : ?>
<nav class="post-nav">
<ul class="pager">
<li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
<li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
</ul>
</nav>
<?php endif; ?>
44 changes: 11 additions & 33 deletions templates/content.php
Original file line number Diff line number Diff line change
@@ -1,34 +1,12 @@
<?php if (!have_posts()) : ?>
<div class="alert">
<?php _e('Sorry, no results were found.', 'roots'); ?>
<article <?php post_class(); ?>>
<header>
<h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
<?php get_template_part('templates/entry-meta'); ?>
</header>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div>
<?php get_search_form(); ?>
<?php endif; ?>

<?php while (have_posts()) : the_post(); ?>
<article <?php post_class(); ?>>
<header>
<h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
<?php get_template_part('templates/entry-meta'); ?>
</header>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div>
<footer>
<?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
</footer>
</article>
<?php endwhile; ?>

<?php if ($wp_query->max_num_pages > 1) : ?>
<nav class="post-nav">
<ul class="pager">
<?php if (get_next_posts_link()) : ?>
<li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
<?php endif; ?>
<?php if (get_previous_posts_link()) : ?>
<li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
<?php endif; ?>
</ul>
</nav>
<?php endif; ?>
<footer>
<?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
</footer>
</article>

0 comments on commit b6e4e92

Please sign in to comment.