Changeset 31641

Timestamp:

03/06/2015 02:05:05 PM (11 years ago)

Author:

helen

Message:

Comments: Show more identifying information for moderation and editing.

Attempting to moderate comments without context about the post is more difficult than necessary. The comment moderation screen you are sent to via email link was also in need of some better visual treatment.

props thaicloud, seanchayes, adamsilverstein.
see #23988.

Location:

trunk/src/wp-admin

Files:

• comment.php (modified) (6 diffs)
• css/common.css (modified) (3 diffs)
• css/edit.css (modified) (2 diffs)
• edit-form-comment.php (modified) (1 diff)

trunk/src/wp-admin/comment.php

@@ -115 +115 @@
 <div class="wrap">
 
-<div class="narrow">
-
 <h2><?php echo esc_html( $title ); ?></h2>
 
@@ -123 +121 @@
         case 'spam' :
                 $caution_msg = __('You are about to mark the following comment as spam:');
-                $button      = __('Spam Comment');
+                $button      = __('Mark as Spam');
                 break;
         case 'trash' :
                 $caution_msg = __('You are about to move the following comment to the Trash:');
-                $button      = __('Trash Comment');
+                $button      = __('Move to Trash');
                 break;
         case 'delete' :
@@ -159 +157 @@
 
 <table class="form-table comment-ays">
-<tr class="alt">
+<tr>
 <th scope="row"><?php _e('Author'); ?></th>
 <td><?php echo $comment->comment_author; ?></td>
@@ -176 +174 @@
 <?php } ?>
 <tr>
+        <th scope="row"><?php _e( 'In Response To' ); ?></th>
+        <td>
+        <?php
+                $post_id = $comment->comment_post_ID;
+                if ( current_user_can( 'edit_post', $post_id ) ) {
+                        $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+                        $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+                } else {
+                        $post_link = esc_html( get_the_title( $post_id ) );
+                }
+                echo $post_link;
+
+                if ( $comment->comment_parent ) {
+                        $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
+                        $parent      = get_comment( $comment->comment_parent );
+                        $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+                        $name        = get_comment_author( $parent->comment_ID );
+                        printf( ' | ' . __( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
+                }
+        ?>
+        </td>
+</tr>
+<tr>
+        <th scope="row"><?php _e( 'Submitted on' ); ?></th>
+        <td>
+        <?php
+                /* translators: 2: comment date, 3: comment time */
+                printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
+                        /* translators: comment date format. See http://php.net/date */
+                        get_comment_date( __( 'Y/m/d' ) ),
+                        get_comment_date( get_option( 'time_format' ) )
+                );
+        ?>
+        </td>
+</tr>
+<tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td><?php echo $comment->comment_content; ?></td>
@@ -181 +215 @@
 </table>
 
-<p><?php _e('Are you sure you want to do this?'); ?></p>
-
-<form action="comment.php" method="get">
-
-<table width="100%">
-<tr>
-<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td>
-<td class="textright"><?php submit_button( $button, 'button' ); ?></td>
-</tr>
-</table>
+<form action="comment.php" method="get" class="comment-ays-submit">
+
+<p>
+        <?php submit_button( $button, 'primary', 'submit', false ); ?>
+        <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a></td>
+</p>
 
 <?php wp_nonce_field( $nonce_action ); ?>
@@ -198 +228 @@
 </form>
 
-</div>
 </div>
 <?php

trunk/src/wp-admin/css/common.css

@@ -178 +178 @@
 .popular-tags,
 .feature-filter,
-.imgedit-group {
+.imgedit-group,
+.comment-ays {
         border: 1px solid #e5e5e5;
         -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
@@ -191 +192 @@
 .popular-tags,
 .feature-filter,
-.imgedit-group {
+.imgedit-group,
+.comment-ays {
         background: #fff;
 }
@@ -1618 +1620 @@
         -moz-box-sizing: border-box;
         box-sizing: border-box;
-}
-
-.narrow {
-        width: 70%;
-        margin-bottom: 40px;
-}
-
-.narrow p {
-        line-height: 150%;
 }
 

trunk/src/wp-admin/css/edit.css

@@ -1146 +1146 @@
 }
 
-.comment-ays {
-        margin-bottom: 0;
-        border-bottom-style: solid;
-        border-bottom-width: 1px;
-}
-
-.comment-ays .alt {
-        background-color: transparent;
+.comment-ays th,
+.comment-ays td {
+        padding: 10px 15px;
+}
+
+.comment-ays-submit .button-cancel {
+        margin-left: 1em;
 }
 
@@ -1562 +1561 @@
 
         /* Moderate Comment */
-        .comment-ays {
-                border-bottom: none;
+        .comment-ays th,
+        .comment-ays td {
+                padding-bottom: 0;
+        }
+
+        .comment-ays td {
+                padding-top: 6px;
         }
 

trunk/src/wp-admin/edit-form-comment.php

@@ -109 +109 @@
 <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0); ?></div>
 </div>
+
+<?php
+$post_id = $comment->comment_post_ID;
+if ( current_user_can( 'edit_post', $post_id ) ) {
+        $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+        $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+} else {
+        $post_link = esc_html( get_the_title( $post_id ) );
+}
+?>
+
+<div class="misc-pub-section misc-pub-response-to">
+        <?php printf( __( 'In response to: <b>%s</b>' ), $post_link ); ?>
+</div>
+
+<?php
+if ( $comment->comment_parent ) :
+        $parent      = get_comment( $comment->comment_parent );
+        $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+        $name        = get_comment_author( $parent->comment_ID );
+?>
+<div class="misc-pub-section misc-pub-reply-to">
+        <?php printf( __( 'In reply to: <b><a href="%1$s">%2$s</a></b>' ), $parent_link, $name ); ?>
+</div>
+<?php endif; ?>
+
 </div> <!-- misc actions -->
 <div class="clear"></div>