Ticket #23988: 23988.2.diff

src/wp-admin/comment.php

@@ -114 +114 @@
 ?>
 <div class="wrap">
 
-<div class="narrow">
-
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php
 switch ( $action ) {
         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' :
                 $caution_msg = __('You are about to delete the following comment:');
@@ -158 +156 @@
 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
 
 <table class="form-table comment-ays">
-<tr class="alt">
+<tr>
 <th scope="row"><?php _e('Author'); ?></th>
 <td><?php echo $comment->comment_author; ?></td>
 </tr>
@@ -175 +173 @@
 </tr>
 <?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>
 </tr>
 </table>
 
-<p><?php _e('Are you sure you want to do this?'); ?></p>
+<form action="comment.php" method="get" class="comment-ays-submit">
 
-<form action="comment.php" method="get">
+<p>
+        <?php submit_button( $button, 'button', 'submit', false ); ?>
+        <a href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e( 'Cancel' ); ?></a></td>
+</p>
 
-<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>
-
 <?php wp_nonce_field( $nonce_action ); ?>
 <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
@@ -198 +228 @@
 </form>
 
 </div>
-</div>
 <?php
         break;
 

src/wp-admin/css/common.css

@@ -177 +177 @@
 .wp-editor-container,
 .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);
         box-shadow: 0 1px 1px rgba(0,0,0,0.04);
@@ -190 +191 @@
 .widgets-holder-wrap,
 .popular-tags,
 .feature-filter,
-.imgedit-group {
+.imgedit-group,
+.comment-ays {
         background: #fff;
 }
 
@@ -1620 +1622 @@
         box-sizing: border-box;
 }
 
-.narrow {
-        width: 70%;
-        margin-bottom: 40px;
-}
-
-.narrow p {
-        line-height: 150%;
-}
-
 .widefat th,
 .widefat td {
         overflow: hidden;

src/wp-admin/css/edit.css

@@ -1167 +1167 @@
         height: 200px;
 }
 
-.comment-ays {
-        margin-bottom: 0;
-        border-bottom-style: solid;
-        border-bottom-width: 1px;
+.comment-ays th,
+.comment-ays td {
+        padding: 10px;
 }
 
-.comment-ays .alt {
-        background-color: transparent;
+form.comment-ays-submit .button {
+        margin-right: 1em;
 }
 
 .trash-undo-inside,
@@ -1593 +1592 @@
         }
 
         /* Moderate Comment */
-        .comment-ays {
-                border-bottom: none;
+        .comment-ays th,
+        .comment-ays td {
+                padding-bottom: 0;
         }
 
+        .comment-ays td {
+                padding-top: 6px;
+        }
+
         /* Links */
         .links-table #link_rel {
                 max-width: none;

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

@@ -108 +108 @@
 <span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a>
 <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>
 </div>