X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/ff81ee6e8304a1982a3ec4f5b134764a29d502cf..72836ec95a52eacbda4dc5aa296b7dd6de08bd3b:/wp-content/themes/default/single.php

diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index 1130d2f5..c9cb4d82 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -1,65 +1,73 @@
-<?php get_header(); ?>
+<?php
+/**
+ * @package WordPress
+ * @subpackage Default_Theme
+ */
+
+get_header();
+?>
+
+	<div id="content" class="widecolumn" role="main">
+
+	<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
-	<div id="content" class="widecolumn">
-				
-  <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-	
 		<div class="navigation">
 			<div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
 			<div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
 		</div>
-	
-		<div class="post" id="post-<?php the_ID(); ?>">
-			<h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-	
-			<div class="entrytext">
+
+		<div <?php post_class() ?> id="post-<?php the_ID(); ?>">
+			<h2><?php the_title(); ?></h2>
+
+			<div class="entry">
 				<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
-	
-				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
-	
+
+				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+				<?php the_tags( '<p>Tags: ', ', ', '</p>'); ?>
+
 				<p class="postmetadata alt">
 					<small>
 						This entry was posted
 						<?php /* This is commented, because it requires a little adjusting sometimes.
 							You'll need to download this plugin, and follow the instructions:
-							http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
-							/* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> 
+							http://binarybonsai.com/wordpress/time-since/ */
+							/* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
 						on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
 						and is filed under <?php the_category(', ') ?>.
-						You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed. 
-						
-						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+						You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
+
+						<?php if ( comments_open() && pings_open() ) {
 							// Both Comments and Pings are open ?>
-							You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
-						
-						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
+							You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
+
+						<?php } elseif ( !comments_open() && pings_open() ) {
 							// Only Pings are Open ?>
-							Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
-						
-						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+							Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
+
+						<?php } elseif ( comments_open() && !pings_open() ) {
 							// Comments are open, Pings are not ?>
 							You can skip to the end and leave a response. Pinging is currently not allowed.
-			
-						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
+
+						<?php } elseif ( !comments_open() && !pings_open() ) {
 							// Neither Comments, nor Pings are open ?>
-							Both comments and pings are currently closed.			
-						
-						<?php } edit_post_link('Edit this entry.','',''); ?>
-						
+							Both comments and pings are currently closed.
+
+						<?php } edit_post_link('Edit this entry','','.'); ?>
+
 					</small>
 				</p>
-	
+
 			</div>
 		</div>
-		
+
 	<?php comments_template(); ?>
-	
+
 	<?php endwhile; else: ?>
-	
+
 		<p>Sorry, no posts matched your criteria.</p>
-	
+
 <?php endif; ?>
-	
+
 	</div>
 
 <?php get_footer(); ?>