From 2a9ff3112d2fd9e1ceacbe9dc84e57b6b48f0950 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Thu, 15 Apr 2004 08:28:53 +0000
Subject: [PATCH] Moderation is cleaner, returns feedback, and correct
 feedback.

git-svn-id: https://develop.svn.wordpress.org/trunk@1075 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/moderation.php | 81 +++++++++++++++--------------------------
 wp-admin/wp-admin.css   |  4 ++
 2 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index 596c366ac0..5e30c6f7c1 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -101,37 +101,37 @@ default:
 	<li class="last"><a href="moderation.php" class="current">Awaiting Moderation</a></li>
 </ul>
 <?php
+$ignored = $_GET['ignored'];
+$deleted = $_GET['deleted'];
+$approved = $_GET['approved'];
 
-	// if we come here after deleting/approving comments we give
-	// a short overview what has been done
-	if (($deleted) || ($approved) || ($ignored)) {
-	    echo "<div class=\"wrap\">\n";
-	    if ($approved) {
-		if ($approved == "1") {
-		    echo "1 comment approved <br />\n";
+if (($deleted) || ($approved) || ($ignored)) {
+	echo "<div class='updated'>\n<p>";
+	if ($approved) {
+		if ('1' == $approved) {
+		echo "1 comment approved <br />\n";
 		} else {
-		    echo "$approved comments approved <br />\n";
+		echo "$approved comments approved <br />\n";
 		}
-	    }
-	    if ($deleted) {
-		if ($deleted == "1") {
-		    echo "1 comment deleted <br />\n";
-		} else {
-		    echo "$approved comments deleted <br />\n";
-		}
-	    }
-	    if ($ignored) {
-		if ($deleted == "1") {
-		    echo "1 comment unchanged <br />\n";
-		} else {
-		    echo "$approved comments unchanged <br />\n";
-		}
-	    
-	    }
-	    echo "</div>\n";
 	}
+	if ($deleted) {
+		if ('1' == $deleted) {
+		echo "1 comment deleted <br />\n";
+		} else {
+		echo "$deleted comments deleted <br />\n";
+		}
+	}
+	if ($ignored) {
+		if ('1' == $ignored) {
+		echo "1 comment unchanged <br />\n";
+		} else {
+		echo "$ignored comments unchanged <br />\n";
+		}
+	}
+	echo "</p></div>\n";
+}
 
-	?>
+?>
 	
 <div class="wrap">
 <?php
@@ -141,7 +141,7 @@ if ($comments) {
     // list all comments that are waiting for approval
     $file = basename(__FILE__);
 ?>
-    <p>The following comments wait for approval:</p>
+    <p>The following comments are in the moderation queue:</p>
     <form name="approval" action="moderation.php" method="post">
     <input type="hidden" name="action" value="update" />
     <ol id="comments">
@@ -166,42 +166,21 @@ echo "<a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."
     }
 ?>
     </ol>
-    <input type="submit" name="submit" value="Moderate Comments" />
+    <p class="submit"><input type="submit" name="submit" value="Moderate Comments &raquo;" /></p>
     </form>
 <?php
 } else {
     // nothing to approve
-    echo "Currently there are no comments to be approved.\n";
+    echo "<p>Currently there are no comments to be approved.</p>\n";
 }
 ?>
 
 </div>
 
 <?php
-if ($comments) { 
-    // show this help text only if there are comments waiting
-?>
-
-<div class="wrap"> 
-	<p>For each comment you have to choose either <em>approve</em>, <em>delete</em> or <em>later</em>:</p>
-	<p><em>approve</em>: approves comment, so that it will be publically visible
-	<?php 
-	    if ('1' == get_settings('comments_notify')) {
-		echo "; the author of the post will be notified about the new comment on his post.</p>\n";
-	    } else {
-		echo ".</p>\n";
-	    }
-	?>	    
-	<p><em>delete</em>: remove the content from your blog (note: you won't be asked again, so you should double-check
-	that you really want to delete the comment - once deleted you can&#8242;t bring them back!)</p>
-	<p><em>later</em>: don&#8242;t change the comment&#8242;s status at all now.</p>
-</div>
-
-<?php
-} // if comments
 
 break;
 }
 
 /* </Template> */
-include("admin-footer.php") ?>
\ No newline at end of file
+include("admin-footer.php") ?>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 23983e3bc2..83b09c196e 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -155,6 +155,10 @@ textarea, input, select {
 	font: 12px Georgia, "Times New Roman", Times, serif;
 }
 
+.submit {
+	text-align: right;
+}
+
 .updated {
 	background-color: #f0f8ff;
 	border: 1px solid #69c;