WP Merge to rev 4709

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@835 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 18 insertions, 2 deletions

diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index 22bcf26..e6d735b 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -123,7 +123,7 @@ $i = 0;
 <?php comment_text() ?>
 <p><?php comment_date('M j, g:i A'); ?> &#8212; [ <?php
 echo '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'">' . __('Edit') . '</a> | ';
-echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete ') . "</a> | "; ?>
+echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete') . "</a> | "; ?>
 <?php
 $post = get_post($comment->comment_post_ID);
 $post_title = wp_specialchars( $post->post_title, 'double' );
diff --git a/wp-admin/upload.css b/wp-admin/upload.css
index efa9512..fbb41cd 100644
--- a/wp-admin/upload.css
+++ b/wp-admin/upload.css
@@ -105,6 +105,19 @@ h2 {
 	line-height: 1.4em;
 }
 
+.wrap h2 {
+	margin: .4em 0 .5em;
+	display: block;
+	border-bottom: .5em solid #e5f3ff;
+	color: #333;
+	font: normal 32px/5px serif;
+	clear: both;
+}
+
+* html .wrap h2 {
+	margin-top: 1em;
+}
+
 .back {
 	display: block;
 	position: absolute;
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 4daf643..f592edb 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -79,7 +79,10 @@ function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}el
 else :
 	add_action( 'admin_head', 'wp_upload_admin_head' );
 	include_once('admin-header.php');
-	echo "<div class='wrap'>";
+?>
+	<div class='wrap'>
+	<h2><?php _e('Uploads'); ?></h2>
+<?php
 endif;
 
 echo "<ul id='upload-menu'>\n";