Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-content / themes / default / archive.php

diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index 2be78027f43fecdedce09102fbf0e64679804708..769f9abd14a03d0eb2733bc81c5fcfabf439bee8 100644 (file)
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -1,57 +1,50 @@
 <?php get_header(); ?>
 
        <div id="content" class="narrowcolumn">
-
+<?php is_tag(); ?>
                <?php if (have_posts()) : ?>
 
-                <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
-<?php /* If this is a category archive */ if (is_category()) { ?>
-               <h2 class="pagetitle">Archive for the '<?php echo single_cat_title(); ?>' Category</h2>
-
+         <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
+         <?php /* If this is a category archive */ if (is_category()) { ?>
+               <h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
+         <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
+               <h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h2>
          <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
                <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
-
-        <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
+         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
                <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
-
-               <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+         <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
                <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
-
-         <?php /* If this is a search */ } elseif (is_search()) { ?>
-               <h2 class="pagetitle">Search Results</h2>
-
          <?php /* If this is an author archive */ } elseif (is_author()) { ?>
                <h2 class="pagetitle">Author Archive</h2>
-
-               <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+         <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
                <h2 class="pagetitle">Blog Archives</h2>
-
-               <?php } ?>
+         <?php } ?>
 
 
                <div class="navigation">
-                       <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
-                       <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
                </div>
 
                <?php while (have_posts()) : the_post(); ?>
                <div class="post">
-                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
                                <small><?php the_time('l, F jS, Y') ?></small>
 
                                <div class="entry">
                                        <?php the_content() ?>
                                </div>
 
-                               <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p> 
+                               <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
 
                        </div>
 
                <?php endwhile; ?>
 
                <div class="navigation">
-                       <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
-                       <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
                </div>
 
        <?php else : ?>
@@ -65,4 +58,4 @@
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>