From e81c5815bd6b5dd29a93a00d52e3ad03d8c4ee65 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Tue, 25 Nov 2008 21:11:05 +0000
Subject: [PATCH] Comment screen tweaks. see #8344

git-svn-id: https://develop.svn.wordpress.org/trunk@9879 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/colors-fresh.css   |  2 +-
 wp-admin/edit-form-advanced.php |  3 +--
 wp-admin/includes/template.php  | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index cbfa479104..cd64b461ee 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -553,7 +553,7 @@ li.widget-list-control-item h4,
 	background-color: #fffbcc;
 }
 
-#edit-slug-box strong, .tablenav .displaying-num {
+#edit-slug-box strong, .tablenav .displaying-num, #submitted-on {
 	color: #777;
 }
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index e3a24253be..fca41086ae 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -425,9 +425,8 @@ wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
 <table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
 <thead>
 	<tr>
-    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
     <th scope="col" class="column-author"><?php _e('Author') ?></th>
-    <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
+    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
   </tr>
 </thead>
 <tbody id="the-comment-list" class="list:comment">
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 6f7c14ac42..d16276a0ce 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -764,9 +764,9 @@ function get_column_headers($page) {
 		case 'edit-comments':
 			$_wp_column_headers[$page] = array(
 				'cb' => '<input type="checkbox" />',
-				'comment' => _c('Comment|noun'),
 				'author' => __('Author'),
-				'date' => __('Submitted'),
+				'comment' => _c('Comment|noun'),
+				//'date' => __('Submitted'),
 				'response' => __('In Response To')
 			);
 
@@ -1924,9 +1924,11 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 	$the_comment_status = wp_get_comment_status($comment->comment_ID);
 
 	if ( current_user_can( 'edit_post', $post->ID ) ) {
-		$post_link = "<a href='" . get_edit_post_link($post->ID) . "'>";
+		$post_href = get_edit_post_link($post->ID);
+		$post_link = "<a href='" . $post_href . "'>";
 		$post_link .= get_the_title($comment->comment_post_ID) . '</a>';
 	} else {
+		$post_href = '';
 		$post_link = get_the_title($comment->comment_post_ID);
 	}
 
@@ -1969,7 +1971,13 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 				break;
 			case 'comment':
 				echo "<td $attributes>";
-				if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
+				echo '<div id="submitted-on">';
+				if ( !empty($post_href) )
+					printf(__('Submitted on <a href="%1$s">%2$s at %3$s</a>'), $post_href, get_comment_date(__('Y/m/d')), get_comment_date(__('g:ia')));
+				else
+					printf(__('Submitted on %1$s at %2$s</a>'), get_comment_date(__('Y/m/d')), get_comment_date(__('g:ia')));
+				echo '</div>';
+				comment_text(); ?>
 				<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
 				<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
 				<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>