diff -r 0d9a58d2c515 -r 0d28b7c10758 web/wp-content/themes/thematic/comments.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/wp-content/themes/thematic/comments.php	Fri Mar 12 13:29:04 2010 +0000
@@ -0,0 +1,135 @@
+<?php thematic_abovecomments() ?>
+			<div id="comments">
+<?php
+	$req = get_option('require_name_email'); // Checks if fields are required.
+	if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
+		die ( 'Please do not load this page directly. Thanks!' );
+	if ( ! empty($post->post_password) ) :
+		if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password ) :
+?>
+				<div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'thematic') ?></div>
+			</div><!-- .comments -->
+<?php
+		return;
+	endif;
+endif;
+?>
+
+<?php if ( have_comments() ) : ?>
+
+<?php /* numbers of pings and comments */
+$ping_count = $comment_count = 0;
+foreach ( $comments as $comment )
+	get_comment_type() == "comment" ? ++$comment_count : ++$ping_count;
+?>
+
+<?php if ( ! empty($comments_by_type['comment']) ) : ?>
+
+<?php thematic_abovecommentslist() ?>
+
+				<div id="comments-list" class="comments">
+					<h3><?php printf($comment_count > 1 ? __(thematic_multiplecomments_text(), 'thematic') : __(thematic_singlecomment_text(), 'thematic'), $comment_count) ?></h3>
+				
+					<ol>
+<?php wp_list_comments(list_comments_arg()); ?>
+					</ol>
+
+        			<div id="comments-nav-below" class="comment-navigation">
+        			     <div class="paginated-comments-links"><?php paginate_comments_links(); ?></div>
+                    </div>
+					
+				</div><!-- #comments-list .comments -->
+
+<?php thematic_belowcommentslist() ?>			
+
+<?php endif; /* if ( $comment_count ) */ ?>
+
+<?php if ( ! empty($comments_by_type['pings']) ) : ?>
+
+<?php thematic_abovetrackbackslist() ?>
+
+				<div id="trackbacks-list" class="comments">
+					<h3><?php printf($ping_count > 1 ? __('<span>%d</span> Trackbacks', 'thematic') : __('<span>One</span> Trackback', 'thematic'), $ping_count) ?></h3>
+					
+					<ol>
+<?php wp_list_comments('type=pings&callback=thematic_pings'); ?>
+					</ol>				
+					
+				</div><!-- #trackbacks-list .comments -->			
+
+<?php thematic_belowtrackbackslist() ?>				
+
+<?php endif /* if ( $ping_count ) */ ?>
+<?php endif /* if ( $comments ) */ ?>
+
+<?php if ( 'open' == $post->comment_status ) : ?>
+				<div id="respond">
+    				<h3><?php comment_form_title( __(thematic_postcomment_text(), 'thematic'), __(thematic_postreply_text(), 'thematic') ); ?></h3>
+    				
+    				<div id="cancel-comment-reply"><?php cancel_comment_reply_link() ?></div>
+
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+					<p id="login-req"><?php printf(__('You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'thematic'),
+					get_option('siteurl') . '/wp-login.php?redirect_to=' . get_permalink() ) ?></p>
+
+<?php else : ?>
+					<div class="formcontainer">	
+					
+<?php thematic_abovecommentsform() ?>					
+
+						<form id="commentform" action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post">
+
+<?php if ( $user_ID ) : ?>
+							<p id="login"><?php printf(__('<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'thematic'),
+								get_option('siteurl') . '/wp-admin/profile.php',
+								wp_specialchars($user_identity, true),
+								wp_logout_url(get_permalink()) ) ?></p>
+
+<?php else : ?>
+
+							<p id="comment-notes"><?php _e('Your email is <em>never</em> published nor shared.', 'thematic') ?> <?php if ($req) _e('Required fields are marked <span class="required">*</span>', 'thematic') ?></p>
+
+                            <div id="form-section-author" class="form-section">
+    							<div class="form-label"><label for="author"><?php _e('Name', 'thematic') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'thematic') ?></div>
+    							<div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" maxlength="20" tabindex="3" /></div>
+                            </div><!-- #form-section-author .form-section -->
+
+                            <div id="form-section-email" class="form-section">
+    							<div class="form-label"><label for="email"><?php _e('Email', 'thematic') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'thematic') ?></div>
+    							<div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" maxlength="50" tabindex="4" /></div>
+                            </div><!-- #form-section-email .form-section -->
+
+                            <div id="form-section-url" class="form-section">
+    							<div class="form-label"><label for="url"><?php _e('Website', 'thematic') ?></label></div>
+    							<div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" maxlength="50" tabindex="5" /></div>
+                            </div><!-- #form-section-url .form-section -->
+
+<?php endif /* if ( $user_ID ) */ ?>
+
+                            <div id="form-section-comment" class="form-section">
+    							<div class="form-label"><label for="comment"><?php _e(thematic_commentbox_text(), 'thematic') ?></label></div>
+    							<div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
+                            </div><!-- #form-section-comment .form-section -->
+                            
+                            <div id="form-allowed-tags" class="form-section">
+                                <p><span><?php _e('You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'thematic') ?></span> <code><?php echo allowed_tags(); ?></code></p>
+                            </div>
+							
+                  <?php do_action('comment_form', $post->ID); ?>
+                  
+							<div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e(thematic_commentbutton_text(), 'thematic') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
+
+                            <?php comment_id_fields(); ?>    
+
+						</form><!-- #commentform -->
+						
+<?php thematic_belowcommentsform() ?>											
+						
+					</div><!-- .formcontainer -->
+<?php endif /* if ( get_option('comment_registration') && !$user_ID ) */ ?>
+
+				</div><!-- #respond -->
+<?php endif /* if ( 'open' == $post->comment_status ) */ ?>
+
+			</div><!-- #comments -->
+<?php thematic_belowcomments() ?>
\ No newline at end of file