From 7ff57ed5469cf609c9307ffda09386c1227c09c4 Mon Sep 17 00:00:00 2001
From: mindfaucet <tyler@mindfaucet.com>
Date: Fri, 4 Dec 2009 11:32:16 -0700
Subject: [PATCH] Final comments.php organization and styling. Pings and
 Trackbacks set with id's and wrap to make it easy to make it expandable with
 a simple JS or jquery action in custom themes.

---
 comments.php | 70 +++++++++++++++++++++++++++-------------------------
 style.css    | 35 ++++++++++++++------------
 2 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/comments.php b/comments.php
index 97b0daf..dbbd88c 100644
--- a/comments.php
+++ b/comments.php
@@ -16,24 +16,45 @@ if ( post_password_required() ) { ?>
 
 
 	<?php if ( ! empty($comments_by_type['comment']) ) : ?>
-		<div class="commentsrsslink">[ <?php comments_rss_link('Comments RSS'); ?> ]</div>
+		
 		<h3 id="comments"><?php comments_number(__('Discussion &not;','comicpress'), __('Discussion &not;','comicpress'), __('Discussion (%) &not;','comicpress') );?></h3>
-
+		<div class="commentsrsslink">[ <?php comments_rss_link('Comments RSS'); ?> ]</div>
 		<ol class="commentlist">
-		<?php 
-		if (function_exists('comicpress_comments_callback')) { 
-			wp_list_comments(array(
-						'type' => 'comment',
-						'reply_text' => __('Reply to %s&not;','comicpress'), 
-						'callback' => 'comicpress_comments_callback',
-						'end-callback' => 'comicpress_comments_end_callback',
-						'avatar_size'=>64
-						)
-					); 
-		} else {
-			wp_list_comments(array('type' => 'comment', 'avatar_size'=>64));
+			<?php if (function_exists('comicpress_comments_callback')) { 
+				wp_list_comments(array(
+							'type' => 'comment',
+							'reply_text' => __('Reply to %s&not;','comicpress'), 
+							'callback' => 'comicpress_comments_callback',
+							'end-callback' => 'comicpress_comments_end_callback',
+							'avatar_size'=>64
+							)
+						); 
+			} else {
+				wp_list_comments(array('type' => 'comment', 'avatar_size'=>64));
 			}?>	
 		</ol>
+		
+		<?php if ( ! empty($comments_by_type['pings']) ) : ?>
+			<div id="pingtrackback-wrap">
+				<h3 id="pingtrackback"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h3>
+				<ol class="commentlist">
+					<ul>
+						<?php if (function_exists('comicpress_comments_callback')) { 
+							wp_list_comments(array(
+										'type' => 'pings',
+										'callback' => 'comicpress_comments_callback',
+										'end-callback' => 'comicpress_comments_end_callback',
+										'avatar_size'=>32
+										)
+									); 
+						} else {
+							wp_list_comments(array('type' => 'pings', 'avatar_size'=>64));
+						}?>	
+					</ul>
+				</ol>
+			</div>
+		<?php endif; ?>
+		
 	<?php endif; ?>
 	
 		<?php if ($comicpress_options['enable_numbered_pagination']) { ?>
@@ -110,26 +131,7 @@ if ( post_password_required() ) { ?>
 
 <?php endif; ?>
 
-	<?php if ( ! empty($comments_by_type['pings']) ) : ?>
-	
-		<h3 id="comments"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h3>
-		<ol class="commentlist">
-		<ul>
-		<?php 
-		if (function_exists('comicpress_comments_callback')) { 
-			wp_list_comments(array(
-						'type' => 'pings',
-						'callback' => 'comicpress_comments_callback',
-						'end-callback' => 'comicpress_comments_end_callback',
-						'avatar_size'=>32
-						)
-					); 
-		} else {
-			wp_list_comments(array('type' => 'pings', 'avatar_size'=>64));
-			}?>	
-			</ul>
-		</ol>
-	<?php endif; ?>
+
 	
 </div>
 <div id="comment-wrapper-foot"></div>
\ No newline at end of file
diff --git a/style.css b/style.css
index 242b95f..617fdb0 100644
--- a/style.css
+++ b/style.css
@@ -631,13 +631,6 @@ h3, h3 a {
 		margin-left: 45px;
 	}
 
-	.pingback .comment-content {
-		margin-left: 0;
-	}
-	
-	.trackback .comment-content {
-		margin-left: 0;
-	}
 		
 .comment-author cite {
 	font-weight: bold;
@@ -684,7 +677,6 @@ h3, h3 a {
 }
 
 .commentsrsslink {
-	float: right;
 	font-size: 11px;
 }
 
@@ -722,11 +714,27 @@ ul.children {
 	list-style: none;
 }
 
-.reply {
-	padding: 10px 0 0 0;
-	text-align: right;
+#respond {
+	padding: 20px 0 0 0;
 }
 
+/* Pingbacks and Trackbacks */
+
+#pingtrackback {
+	font-size: 16px;
+}
+
+.pingback .comment-content, .trackback .comment-content {
+	margin-left: 0;
+}
+
+.trackback .comment-author cite, .pingback .comment-author cite {
+	font-weight: bold;
+	font-style: normal;
+	font-size: 13px;
+}
+
+
 /* ARCHIVE */
 /* For the built-in WordPress archive pages (by month or category) as well as search result pages */
 
@@ -1096,11 +1104,6 @@ ul.children {
 	overflow: hidden;
 }
 
-/* Pingbacks and Trackbacks */
-
-li.pingback div p, li.trackback div p {
-	margin-left: 0;
-}
 
 /* STORYLINES */