Changeset 10102

Timestamp:

12/07/2008 07:10:47 AM (16 years ago)

Author:

markjaquith

Message:

Much better In Response To column, with pretty comment bubble

Location:

trunk

Files:

• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (5 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/edit-comments.php

@@ -191 +191 @@
 list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5, $post_id, $comment_type ); // Grab a few extra
 
+$_comment_post_ids = array();
+foreach ( $_comments as $_c ) {
+    $_comment_post_ids[] = $_c->comment_post_ID;
+}
+$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids);
+foreach ( (array) $_comment_post_ids as $_cpid )
+    $_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0;
+if ( empty($_comment_pending_count) )
+    $_comment_pending_count = array();
+
 $comments = array_slice($_comments, 0, $comments_per_page);
 $extra_comments = array_slice($_comments, $comments_per_page);

trunk/wp-admin/includes/template.php

@@ -1945 +1945 @@
  */
 function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) {
-    global $comment, $post;
+    global $comment, $post, $_comment_pending_count;
     $comment = get_comment( $comment_id );
     $post = get_post($comment->comment_post_ID);
     $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_link .= get_the_title($comment->comment_post_ID) . '</a>';
-    } else {
-        $post_link = get_the_title($comment->comment_post_ID);
-    }
 
     $author_url = get_comment_author_url();
@@ -1972 +1965 @@
         $ptime = mysql2date(__('Y/m/d \a\t g:i A'), $comment->comment_date );
 
-    $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
-    $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
-    $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
-    $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
+    $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$post->ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
+    $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$post->ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
+    $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$post->ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
+    $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$post->ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
 
     echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
@@ -1993 +1986 @@
                 if ( !$checkbox ) break;
                 echo '<th scope="row" class="check-column">';
-                if ( current_user_can('edit_post', $comment->comment_post_ID) ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
+                if ( current_user_can('edit_post', $post->ID) ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
                 echo '</th>';
                 break;
@@ -2012 +2005 @@
                 $actions = array();
 
-                if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+                if ( current_user_can('edit_post', $post->ID) ) {
                     $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
                     $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
@@ -2073 +2066 @@
             case 'response':
                 if ( 'single' !== $mode ) {
+                    if ( isset( $_comment_pending_count[$post->ID] ) ) {
+                        $pending_comments = absint( $_comment_pending_count[$post->ID] );
+                    } else {
+                        $_comment_pending_count_temp = (array) get_pending_comments_num( array( $post->ID ) );
+                        $pending_comments = $_comment_pending_count[$post->ID] = $_comment_pending_count_temp[$post->ID];
+                    }
+                    if ( current_user_can( 'edit_post', $post->ID ) ) {
+                        $post_link = "<a href='" . get_edit_post_link($post->ID) . "'>";
+                        $post_link .= get_the_title($post->ID) . '</a>';
+                    } else {
+                        $post_link = get_the_title($post->ID);
+                    }
                     echo "<td $attributes>\n";
-                    echo "&quot;$post_link&quot; ";
-                    echo '<a href="edit-comments.php?p=' . $post->ID;
-                    if ( !empty($_GET['comment_type']) ) echo '&amp;comment_type=' . htmlspecialchars( $_GET['comment_type'] );
-                    echo '">' . sprintf ( __ngettext('(%s)', '(%s)', $post->comment_count), number_format_i18n($post->comment_count) ) . '</a> <a href="' . get_permalink($post->ID) . '">#</a><br />';
-                    echo get_the_time(__('Y/m/d \a\t g:ia'));
+                    echo "&#8220;$post_link&#8221;<br />";
+
+                    echo '<span class="post-com-count-wrapper">';
+                    $pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
+                    if ( $pending_comments )
+                        echo '<strong>';
+                    comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
+                    if ( $pending_comments )
+                        echo '</strong>';
+                    echo '</span> ';
+                    echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
                     echo '</td>';
                 }

trunk/wp-admin/wp-admin.css

@@ -1095 +1095 @@
 }
 
+.column-response .post-com-count-wrapper {
+}
+
+.column-response .post-com-count {
+    float: left;
+    margin-right: 5px;
+    text-align: center;
+}
+
 /* end menu stuff */
 

trunk/wp-includes/script-loader.php

@@ -303 +303 @@
     $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
 
-    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081206' );
+    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081207' );
     $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );