<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31641] trunk/src/wp-admin: Comments: Show more identifying information for moderation and editing.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31641">31641</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31641","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-06 14:05:05 +0000 (Fri, 06 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/23988">#23988</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2015-03-06 13:56:44 UTC (rev 31640)
+++ trunk/src/wp-admin/comment.php 2015-03-06 14:05:05 UTC (rev 31641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,19 +114,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="narrow">
-
</del><span class="cx" style="display: block; padding: 0 10px"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'spam' :
</span><span class="cx" style="display: block; padding: 0 10px"> $caution_msg = __('You are about to mark the following comment as spam:');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = __('Spam Comment');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button = __('Mark as Spam');
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trash' :
</span><span class="cx" style="display: block; padding: 0 10px"> $caution_msg = __('You are about to move the following comment to the Trash:');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = __('Trash Comment');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button = __('Move to Trash');
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete' :
</span><span class="cx" style="display: block; padding: 0 10px"> $caution_msg = __('You are about to delete the following comment:');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table comment-ays">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="alt">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Author'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo $comment->comment_author; ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,22 +173,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo $comment->comment_content; ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e('Are you sure you want to do this?'); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<form action="comment.php" method="get" class="comment-ays-submit">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<form action="comment.php" method="get">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<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>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<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>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( $nonce_action ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +228,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-03-06 13:56:44 UTC (rev 31640)
+++ trunk/src/wp-admin/css/common.css 2015-03-06 14:05:05 UTC (rev 31641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-editor-container,
</span><span class="cx" style="display: block; padding: 0 10px"> .popular-tags,
</span><span class="cx" style="display: block; padding: 0 10px"> .feature-filter,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.imgedit-group {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.imgedit-group,
+.comment-ays {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #e5e5e5;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +191,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .widgets-holder-wrap,
</span><span class="cx" style="display: block; padding: 0 10px"> .popular-tags,
</span><span class="cx" style="display: block; padding: 0 10px"> .feature-filter,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.imgedit-group {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.imgedit-group,
+.comment-ays {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1619,15 +1621,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.narrow {
- width: 70%;
- margin-bottom: 40px;
-}
-
-.narrow p {
- line-height: 150%;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .widefat th,
</span><span class="cx" style="display: block; padding: 0 10px"> .widefat td {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #555;
</span></span></pre></div>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2015-03-06 13:56:44 UTC (rev 31640)
+++ trunk/src/wp-admin/css/edit.css 2015-03-06 14:05:05 UTC (rev 31641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1145,14 +1145,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 200px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.comment-ays {
- margin-bottom: 0;
- border-bottom-style: solid;
- border-bottom-width: 1px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.comment-ays th,
+.comment-ays td {
+ padding: 10px 15px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.comment-ays .alt {
- background-color: transparent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.comment-ays-submit .button-cancel {
+ margin-left: 1em;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .trash-undo-inside,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1561,10 +1560,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Moderate Comment */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .comment-ays {
- border-bottom: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .comment-ays th,
+ .comment-ays td {
+ padding-bottom: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .comment-ays td {
+ padding-top: 6px;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Links */
</span><span class="cx" style="display: block; padding: 0 10px"> .links-table #link_rel {
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: none;
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2015-03-06 13:56:44 UTC (rev 31640)
+++ trunk/src/wp-admin/edit-form-comment.php 2015-03-06 14:05:05 UTC (rev 31641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +108,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="timestamp"><?php printf($stamp, $date); ?></span> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<?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; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- misc actions -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>