From 01a5afbbae4fc4cd128157ef22bf94a51753187c Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 30 Jun 2009 20:02:33 -0400
Subject: [PATCH] implement FS#33, part 2

---
 archive.php           |   2 +-
 comments.php          | 118 +++++++++++++++++++++---------------------
 search-transcript.php |   2 +-
 search.php            |   6 +--
 4 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/archive.php b/archive.php
index 2227a1d..f3c12e4 100644
--- a/archive.php
+++ b/archive.php
@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="column" class="archive">
+<div id="content" class="archive">
 
 	<?php if (have_posts()) : ?>
 
diff --git a/comments.php b/comments.php
index 35f217f..4c86542 100644
--- a/comments.php
+++ b/comments.php
@@ -1,91 +1,93 @@
-<div class="comment-wrap">
+<div id="content" class="narrowcolumn">
+  <div class="comment-wrap">
 
-<?php
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
+  <?php
+    if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+      die ('Please do not load this page directly. Thanks!');
 
-	if ( post_password_required() ) { ?>
-		<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
-	<?php
-		return;
-	}
+    if ( post_password_required() ) { ?>
+      <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+    <?php
+      return;
+    }
 
-	if ( have_comments() ) : ?>
+    if ( have_comments() ) : ?>
 
-	<h3 id="comments"><?php comments_number('Discussion&not;', 'Discussion&not;', 'Discussion (%)&not;' );?></h3>
+    <h3 id="comments"><?php comments_number('Discussion&not;', 'Discussion&not;', 'Discussion (%)&not;' );?></h3>
 
-	<ol class="commentlist">
-	<?php wp_list_comments(array('avatar_size'=>64)); ?>
-	</ol>
-		<div class="pagenav">
-			<div class="pagenav-right"><?php next_comments_link('Newer Comments &uarr;') ?></div>
-			<div class="pagenav-left"><?php previous_comments_link('&darr; Previous Comments') ?></div>
-			<div class="clear"></div>
-		</div>
- <?php else : // this is displayed if there are no comments so far ?>
+    <ol class="commentlist">
+    <?php wp_list_comments(array('avatar_size'=>64)); ?>
+    </ol>
+      <div class="pagenav">
+        <div class="pagenav-right"><?php next_comments_link('Newer Comments &uarr;') ?></div>
+        <div class="pagenav-left"><?php previous_comments_link('&darr; Previous Comments') ?></div>
+        <div class="clear"></div>
+      </div>
+   <?php else : // this is displayed if there are no comments so far ?>
 
-	<?php if ('open' == $post->comment_status) : ?>
-		<!-- If comments are open, but there are no comments. -->
+    <?php if ('open' == $post->comment_status) : ?>
+      <!-- If comments are open, but there are no comments. -->
 
-	 <?php else : // comments are closed ?>
-		<!-- If comments are closed. -->
-		<p class="nocomments">Comments are closed.</p>
+     <?php else : // comments are closed ?>
+      <!-- If comments are closed. -->
+      <p class="nocomments">Comments are closed.</p>
 
-	<?php endif; ?>
-<?php endif; ?>
+    <?php endif; ?>
+  <?php endif; ?>
 
 
-<?php if ('open' == $post->comment_status) : ?>
+  <?php if ('open' == $post->comment_status) : ?>
 
-<div id="respond">
+  <div id="respond">
 
-<h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
+  <h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
 
-<div class="cancel-comment-reply">
-	<small><?php cancel_comment_reply_link(); ?></small>
-</div>
+  <div class="cancel-comment-reply">
+    <small><?php cancel_comment_reply_link(); ?></small>
+  </div>
 
-<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
-<?php else : ?>
+  <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+  <p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+  <?php else : ?>
 
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+  <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
-<?php if ( $user_ID ) : ?>
+  <?php if ( $user_ID ) : ?>
 
-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+  <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
 
-<?php else : ?>
+  <?php else : ?>
 
 
-<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-<label for="author"><small>NAME &mdash; <a href="http://gravatar.com">Get an avatar</a></small></label></p>
+  <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+  <label for="author"><small>NAME &mdash; <a href="http://gravatar.com">Get an avatar</a></small></label></p>
 
-<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-<label for="email"><small>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </small></label></p>
+  <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
+  <label for="email"><small>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </small></label></p>
 
-<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-<label for="url"><small>WEBSITE</small></label></p>
+  <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+  <label for="url"><small>WEBSITE</small></label></p>
 
-<?php endif; ?>
+  <?php endif; ?>
 
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+  <!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
 
-<p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
+  <p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
 
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-<?php comment_id_fields(); ?>
-</p>
+  <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+  <?php comment_id_fields(); ?>
+  </p>
 
-<div class="clear"></div>
+  <div class="clear"></div>
 
-<?php do_action('comment_form', $post->ID); ?>
+  <?php do_action('comment_form', $post->ID); ?>
 
-</form>
+  </form>
 
-<?php endif; // If registration required and not logged in ?>
-</div>
+  <?php endif; // If registration required and not logged in ?>
+  </div>
 
-<?php endif; ?>
+  <?php endif; ?>
 
+  </div>
 </div>
\ No newline at end of file
diff --git a/search-transcript.php b/search-transcript.php
index 3ff4db7..3fc36d8 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="column" class="archive">
+<div id="content" class="archive">
 
   <div class="post-page-head"></div>
   <div class="post-page">			
diff --git a/search.php b/search.php
index 1d80a8b..19bd499 100644
--- a/search.php
+++ b/search.php
@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="column" class="archive">
+<div id="content" class="archive">
 
   <div class="post-page-head"></div>
   <div class="post-page">			
@@ -44,7 +44,7 @@
           
         <?php } ?>
       
-    <?php endwhile; ?>
+    <?php endwhile ?>
     
     <div class="pagenav">
       <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
@@ -63,7 +63,7 @@
     </div>
     <div class="post-page-foot"></div>
 
-  <?php endif; ?>
+  <?php endif ?>
 
 </div>