Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Better comments listing, props Matt

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-10-30 12:24:11 +00:00
parent e6573d012d
commit 016942b825
10 changed files with 117 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/css/colors-fresh.css
View File

@ -29,7 +29,8 @@ div.dashboard-widget,
border-color: #ccc;
}
.widefat {
.widefat,
#replyrow {
border-color: #dfdfdf;
}

23
wp-admin/edit-comments.php
View File

@ -242,32 +242,19 @@ if ( 'spam' == $comment_status ) {
<div class="clear"></div>
<?php if ( $comments ) { ?>
<table class="widefat">
<thead>
<tr>
<?php print_column_headers('comment'); ?>
</tr>
</thead>
<tfoot>
<tr>
<?php print_column_headers('comment', false); ?>
</tr>
</tfoot>
<tbody id="the-comment-list" class="list:comment">
<ol id="the-comment-list" class="list:comment">
<?php
foreach ($comments as $comment)
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
?>
</tbody>
<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
</ol>
<ol id="the-extra-comment-list" class="list:comment" style="display: none;">
<?php
foreach ($extra_comments as $comment)
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
?>
</tbody>
</table>
</ol>
<div class="tablenav">
<?php
@ -330,5 +317,5 @@ if ( $page_links )
</div>
<?php
wp_comment_reply('-1', true, 'detail');
wp_comment_reply('-1', true, 'detail', false);
include('admin-footer.php'); ?>

15
wp-admin/edit-form-advanced.php
View File

@ -368,17 +368,10 @@ function post_comment_status_meta_box($post) {
wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
?>
<table class="widefat comments-box" style="display:none;">
<thead>
<tr>
<th scope="col"><?php _e('Comments') ?></th>
<th scope="col"><?php _e('Author') ?></th>
<th scope="col"><?php _e('Submitted') ?></th>
</tr>
</thead>
<tbody id="the-comment-list" class="list:comment">
</tbody>
</table>
<div class="comments-box" style="display:none;">
<ol id="the-comment-list" class="list:comment">
</ol>
</div>
<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p>
<?php
$hidden = (array) get_user_option( "meta-box-hidden_post" );

13
wp-admin/edit-pages.php
View File

@ -277,21 +277,12 @@ if ( 1 == count($posts) && is_singular() ) :
<br class="clear" />
<table class="widefat" style="margin-top: .5em">
<thead>
<tr>
<th scope="col"><?php _e('Comment') ?></th>
<th scope="col"><?php _e('Date') ?></th>
<th scope="col"><?php _e('Actions') ?></th>
</tr>
</thead>
<tbody id="the-comment-list" class="list:comment">
<ol id="the-comment-list" class="list:comment">
<?php
foreach ($comments as $comment)
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
?>
</tbody>
</table>
</ol>
<?php
wp_comment_reply();

22
wp-admin/edit.php
View File

@ -279,30 +279,12 @@ if ( 1 == count($posts) && is_singular() ) :
<br class="clear" />
<table class="widefat" style="margin-top: .5em">
<thead>
<tr>
<th scope="col"><?php _e('Comment') ?></th>
<th scope="col"><?php _e('Author') ?></th>
<th scope="col"><?php _e('Submitted') ?></th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="col"><?php _e('Comment') ?></th>
<th scope="col"><?php _e('Author') ?></th>
<th scope="col"><?php _e('Submitted') ?></th>
</tr>
</tfoot>
<tbody id="the-comment-list" class="list:comment">
<ol id="the-comment-list" class="list:comment">
<?php
foreach ($comments as $comment)
_wp_comment_row( $comment->comment_ID, 'single', false, false );
?>
</tbody>
</table>
</ol>
<?php
wp_comment_reply();

165
wp-admin/includes/template.php
View File

@ -1858,109 +1858,70 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
$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" ) );
?>
<li id='comment-<?php echo $comment->comment_ID; ?>' class='<?php echo $the_comment_status; ?> comment-list-item'>
<p class="comment-author"><strong><?php comment_author(); ?></strong>
<?php if ( current_user_can( 'edit_post', $post->ID ) && !empty( $comment->comment_author_email ) ) { echo ' | '; comment_author_email_link(); } ?>
<span class="sepa">|</span> <a href="edit-comments.php?s=<?php comment_author_IP(); ?>"><?php comment_author_IP(); ?></a> <span class="sepa">|</span> <a href="<?php echo get_permalink( $post->ID ) . '#comment-' . $comment->comment_ID; ?>" style="text-decoration: none;">#</a><br />
<?php if ( !empty($author_url) ) echo "<a href='$author_url'>$author_url_display</a>"; ?>
</p>
echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
$columns = get_column_headers('comment');
$hidden = (array) get_user_option( 'manage-comment-columns-hidden' );
foreach ( $columns as $column_name => $column_display_name ) {
$class = "class=\"$column_name column-$column_name\"";
<?php if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
<div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
<div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
</div>
$style = '';
if ( in_array($column_name, $hidden) )
$style = ' style="display:none;"';
<?php
// TODO: I don't think checkboxes really matter anymore
// if ( $checkbox && current_user_can( 'edit_post', $comment->comment_post_ID ) )
// echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
?>
$attributes = "$class$style";
<?php
$actions = array();
switch ($column_name) {
case 'cb':
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' />";
echo '</th>';
break;
case 'comment':
echo "<td $attributes>";
if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
<div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
<div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
</div>
<?php
$actions = array();
if ( current_user_can('edit_post', $comment->comment_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>';
if ( $comment_status ) { // not looking at all comments
if ( 'approved' == $the_comment_status ) {
$actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
unset($actions['approve']);
} else {
$actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
unset($actions['unapprove']);
}
}
if ( 'spam' != $the_comment_status )
$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>';
$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
if ( 'spam' != $the_comment_status )
$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
$actions = apply_filters( 'comment_row_actions', $actions, $comment );
$i = 0;
foreach ( $actions as $action => $link ) {
++$i;
( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
// Reply and quickedit need a hide-if-no-js span
if ( 'reply' == $action || 'quickedit' == $action )
$action .= ' hide-if-no-js';
echo "<span class='$action'>$sep$link</span>";
}
}
echo '</td>';
break;
case 'author':
echo "<td $attributes><strong>"; comment_author(); echo '</strong><br />';
if ( !empty($author_url) )
echo "<a href='$author_url'>$author_url_display</a><br />";
if ( current_user_can( 'edit_post', $post->ID ) ) {
if ( !empty($comment->comment_author_email) ) {
comment_author_email_link();
echo '<br />';
}
echo '<a href="edit-comments.php?s=';
comment_author_IP();
echo '&amp;mode=detail">';
comment_author_IP();
echo '</a>';
} //current_user_can
echo '</td>';
break;
case 'date':
echo "<td $attributes>" . get_comment_date(__('Y/m/d \a\t g:ia')) . '</td>';
break;
case 'response':
if ( 'single' !== $mode ) {
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 comment)', '(%s comments)', $post->comment_count), $post->comment_count ) . '</a><br />';
echo get_the_time(__('Y/m/d \a\t g:ia'));
echo '</td>';
}
if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
$actions['approve'] = "<span class='comment-action-link'><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></span>';
$actions['unapprove'] = "<span class='comment-action-link'><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></span>';
if ( $comment_status ) { // not looking at all comments
if ( 'approved' == $the_comment_status ) {
$actions['unapprove'] = "<span class='comment-action-link'><a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a></span>';
unset($actions['approve']);
} else {
$actions['approve'] = "<span class='comment-action-link'><a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a></span>';
unset($actions['unapprove']);
}
}
echo "</tr>\n";
if ( 'spam' != $the_comment_status )
$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>';
$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>';
if ( 'spam' != $the_comment_status )
$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
$actions = apply_filters( 'comment_row_actions', $actions, $comment );
$i = 0;
foreach ( $actions as $action => $link ) {
++$i;
( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' <span class="sepa">|</span> ';
// Reply and quickedit need a hide-if-no-js span
if ( 'reply' == $action || 'quickedit' == $action )
$action .= ' hide-if-no-js';
echo "<span class='$action'>$sep$link</span>";
}
}
?>
&nbsp;<span class="sepa">&#8212;</span>&nbsp; <?php echo get_comment_date( __('Y/m/d \a\t g:ia') ); ?> <span class="sepa">|</span> <a href="<?php echo get_permalink( $post->ID ); ?>" style="text-decoration: none;">&para;</a> <?php echo $post_link; ?>
</li>
<?php
}
/**
@ -1972,7 +1933,7 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
* @param unknown_type $checkbox
* @param unknown_type $mode
*/
function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = false) {
global $current_user;
// allow plugin to replace the popup content
@ -1987,7 +1948,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<?php if ( $table_row ) : ?>
<table style="display:none;"><tbody id="com-reply"><tr id="replyrow"><td colspan="6">
<?php else : ?>
<div id="com-reply" style="display:none;"><div id="replyrow">
<ul id="com-reply" style="display:none;"><li id="replyrow">
<?php endif; ?>
<div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
@ -2035,7 +1996,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<?php if ( $table_row ) : ?>
</td></tr></tbody></table>
<?php else : ?>
</div></div>
</li></ul>
<?php endif; ?>
</form>
<?php
@ -2828,7 +2789,7 @@ function find_posts_div($found_action = '') {
<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
<label class="hidden" for="find-posts-input"><?php _e( 'Search' ); ?></label>
<input type="text" id="find-posts-input" class="search-input" name="ps" value="" />
<input type="button" onclick="findPosts.send();" value="<?php _e( 'Search' ); ?>" class="button" /><br />
<input type="button" onClick="findPosts.send();" value="<?php _e( 'Search' ); ?>" class="button" /><br />
<input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
<label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
@ -2838,7 +2799,7 @@ function find_posts_div($found_action = '') {
<div id="find-posts-response"></div>
</div>
<div class="find-box-buttons">
<input type="button" class="button" onclick="findPosts.close();" value="<?php _e('Close'); ?>" />
<input type="button" class="button" onClick="findPosts.close();" value="<?php _e('Close'); ?>" />
<input id="find-posts-submit" type="submit" class="button" value="<?php _e('Select'); ?>" />
</div>
</div>

6
wp-admin/js/edit-comments.js
View File

@ -88,9 +88,7 @@ $(document).ready(function(){
commentReply = {
init : function() {
this.rows = $('#the-comment-list tr');
if ( !this.rows.size() )
this.rows = $('#the-comment-list > div.comment-item');
this.rows = $('#the-comment-list li');
var row = $('#replyrow');
$('a.cancel', row).click(function() { return commentReply.revert(); });
@ -149,7 +147,7 @@ commentReply = {
t.close();
t.o = '#comment-'+id;
$('#replyrow td').attr('colspan', $('.widefat thead th:visible').length);
// $('#replyrow td').attr('colspan', $('.widefat thead th:visible').length);
var editRow = $('#replyrow'), rowData = $('#inline-'+id);
var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';

4
wp-admin/js/post.js
View File

@ -287,7 +287,7 @@ jQuery(document).ready( function($) {
$.post('admin-ajax.php', data,
function(r) {
var r = wpAjax.parseAjaxResponse(r);
$('#commentstatusdiv .widefat').show();
$('#commentstatusdiv .comments-box').show();
$('.waiting').hide();
if ( 'object' == typeof r && r.responses[0] ) {
@ -308,7 +308,7 @@ jQuery(document).ready( function($) {
return;
}
$('#the-comment-list').append('<tr><td colspan="5">'+wpAjax.broken+'</td></tr>');
$('#the-comment-list').append('<li>'+wpAjax.broken+'</li>');
}
);

14
wp-admin/upload.php
View File

@ -415,21 +415,13 @@ if ( 1 == count($posts) && is_singular() ) :
<br class="clear" />
<table class="widefat" style="margin-top: .5em">
<thead>
<tr>
<th scope="col"><?php _e('Comment') ?></th>
<th scope="col"><?php _e('Date') ?></th>
<th scope="col"><?php _e('Actions') ?></th>
</tr>
</thead>
<tbody id="the-comment-list" class="list:comment">
<ol id="the-comment-list" class="list:comment">
<?php
foreach ($comments as $comment)
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
?>
</tbody>
</table>
</ol>
<?php
wp_comment_reply();

51
wp-admin/wp-admin.css
View File

@ -1925,9 +1925,29 @@ body.wp-admin {
margin: -5px 0 0 10px;
}
#the-comment-list td.comment p.comment-author {
margin-top: 0;
margin-left: 0;
#the-comment-list {
list-style: none;
margin: 0;
padding: 0;
font-size: 11px;
}
#the-comment-list .sepa {
color: #999;
}
#the-comment-list .comment-action-link {
width: 6em;
display: inline-block;
}
#the-comment-list p.comment-author {
height: 2.8em;
}
#the-comment-list li.comment-list-item {
padding: 0 1.2em 1em;
border-bottom: 1px solid #ccc;
}
#the-comment-list p.comment-author img {
@ -1939,22 +1959,6 @@ body.wp-admin {
border: none;
}
#the-comment-list td {
vertical-align: top;
}
#the-comment-list td.comment {
/*
width: 65%;
max-width: 460px;
*/
word-wrap: break-word;
}
#the-comment-list .check-column {
padding-top: 8px;
}
#templateside ul li a {
text-decoration: none;
}
@ -2245,7 +2249,10 @@ fieldset {
/* reply to comments */
#replyrow {
border-width: 1px;
border-style: solid;
font-size: 11px;
margin: 0 0 12px;
}
#replyrow input {
@ -2905,3 +2912,9 @@ abbr.required {
.setting-description {
font-style: italic;
}
.comments-box {
margin: 12px 0 5px;
}