Permalink
Browse files

Merge pull request #738 from JeremyEnglert/master

Removed #post-not-found as it would never display
  • Loading branch information...
2 parents 68c51d1 + 86b5ede commit 22dbfcb0742b550612e9e6fbb49ef1b494c0ce89 @eddiemachado committed Mar 16, 2015
Showing with 5 additions and 49 deletions.
  1. +4 −34 archive.php
  2. +1 −15 page.php
View
@@ -6,41 +6,11 @@
<main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
- <?php if (is_category()) { ?>
- <h1 class="archive-title h2">
- <span><?php _e( 'Posts Categorized:', 'bonestheme' ); ?></span> <?php single_cat_title(); ?>
- </h1>
-
- <?php } elseif (is_tag()) { ?>
- <h1 class="archive-title h2">
- <span><?php _e( 'Posts Tagged:', 'bonestheme' ); ?></span> <?php single_tag_title(); ?>
- </h1>
-
- <?php } elseif (is_author()) {
- global $post;
- $author_id = $post->post_author;
+ <?php
+ the_archive_title( '<h1 class="page-title">', '</h1>' );
+ the_archive_description( '<div class="taxonomy-description">', '</div>' );
?>
- <h1 class="archive-title h2">
-
- <span><?php _e( 'Posts By:', 'bonestheme' ); ?></span> <?php the_author_meta('display_name', $author_id); ?>
-
- </h1>
- <?php } elseif (is_day()) { ?>
- <h1 class="archive-title h2">
- <span><?php _e( 'Daily Archives:', 'bonestheme' ); ?></span> <?php the_time('l, F j, Y'); ?>
- </h1>
-
- <?php } elseif (is_month()) { ?>
- <h1 class="archive-title h2">
- <span><?php _e( 'Monthly Archives:', 'bonestheme' ); ?></span> <?php the_time('F Y'); ?>
- </h1>
-
- <?php } elseif (is_year()) { ?>
- <h1 class="archive-title h2">
- <span><?php _e( 'Yearly Archives:', 'bonestheme' ); ?></span> <?php the_time('Y'); ?>
- </h1>
- <?php } ?>
-
+
<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
<article id="post-<?php the_ID(); ?>" <?php post_class( 'cf' ); ?> role="article">
View
@@ -54,21 +54,7 @@
</article>
- <?php endwhile; else : ?>
-
- <article id="post-not-found" class="hentry cf">
- <header class="article-header">
- <h1><?php _e( 'Oops, Post Not Found!', 'bonestheme' ); ?></h1>
- </header>
- <section class="entry-content">
- <p><?php _e( 'Uh Oh. Something is missing. Try double checking things.', 'bonestheme' ); ?></p>
- </section>
- <footer class="article-footer">
- <p><?php _e( 'This is the error message in the page.php template.', 'bonestheme' ); ?></p>
- </footer>
- </article>
-
- <?php endif; ?>
+ <?php endwhile; endif; ?>
</main>

0 comments on commit 22dbfcb

Please sign in to comment.