Revert [9413]
git-svn-id: http://svn.automattic.com/wordpress/trunk@9414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
016942b825
commit
166ccef6c3
|
@ -29,8 +29,7 @@ div.dashboard-widget,
|
||||||
border-color: #ccc;
|
border-color: #ccc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.widefat,
|
.widefat {
|
||||||
#replyrow {
|
|
||||||
border-color: #dfdfdf;
|
border-color: #dfdfdf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -242,19 +242,32 @@ if ( 'spam' == $comment_status ) {
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
|
|
||||||
<?php if ( $comments ) { ?>
|
<?php if ( $comments ) { ?>
|
||||||
|
<table class="widefat">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<?php print_column_headers('comment'); ?>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
<ol id="the-comment-list" class="list:comment">
|
<tfoot>
|
||||||
|
<tr>
|
||||||
|
<?php print_column_headers('comment', false); ?>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
|
|
||||||
|
<tbody id="the-comment-list" class="list:comment">
|
||||||
<?php
|
<?php
|
||||||
foreach ($comments as $comment)
|
foreach ($comments as $comment)
|
||||||
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
|
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
|
||||||
?>
|
?>
|
||||||
</ol>
|
</tbody>
|
||||||
<ol id="the-extra-comment-list" class="list:comment" style="display: none;">
|
<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
|
||||||
<?php
|
<?php
|
||||||
foreach ($extra_comments as $comment)
|
foreach ($extra_comments as $comment)
|
||||||
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
|
_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
|
||||||
?>
|
?>
|
||||||
</ol>
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
<div class="tablenav">
|
<div class="tablenav">
|
||||||
<?php
|
<?php
|
||||||
|
@ -317,5 +330,5 @@ if ( $page_links )
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
wp_comment_reply('-1', true, 'detail', false);
|
wp_comment_reply('-1', true, 'detail');
|
||||||
include('admin-footer.php'); ?>
|
include('admin-footer.php'); ?>
|
||||||
|
|
|
@ -368,10 +368,17 @@ function post_comment_status_meta_box($post) {
|
||||||
wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
|
wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="comments-box" style="display:none;">
|
<table class="widefat comments-box" style="display:none;">
|
||||||
<ol id="the-comment-list" class="list:comment">
|
<thead>
|
||||||
</ol>
|
<tr>
|
||||||
</div>
|
<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>
|
||||||
<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>
|
<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
|
<?php
|
||||||
$hidden = (array) get_user_option( "meta-box-hidden_post" );
|
$hidden = (array) get_user_option( "meta-box-hidden_post" );
|
||||||
|
|
|
@ -277,12 +277,21 @@ if ( 1 == count($posts) && is_singular() ) :
|
||||||
|
|
||||||
<br class="clear" />
|
<br class="clear" />
|
||||||
|
|
||||||
<ol id="the-comment-list" class="list:comment">
|
<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">
|
||||||
<?php
|
<?php
|
||||||
foreach ($comments as $comment)
|
foreach ($comments as $comment)
|
||||||
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
|
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
|
||||||
?>
|
?>
|
||||||
</ol>
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
wp_comment_reply();
|
wp_comment_reply();
|
||||||
|
|
|
@ -279,12 +279,30 @@ if ( 1 == count($posts) && is_singular() ) :
|
||||||
|
|
||||||
<br class="clear" />
|
<br class="clear" />
|
||||||
|
|
||||||
<ol id="the-comment-list" class="list:comment">
|
<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">
|
||||||
<?php
|
<?php
|
||||||
foreach ($comments as $comment)
|
foreach ($comments as $comment)
|
||||||
_wp_comment_row( $comment->comment_ID, 'single', false, false );
|
_wp_comment_row( $comment->comment_ID, 'single', false, false );
|
||||||
?>
|
?>
|
||||||
</ol>
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
wp_comment_reply();
|
wp_comment_reply();
|
||||||
|
|
|
@ -1858,70 +1858,109 @@ 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" ) );
|
$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" ) );
|
$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" ) );
|
$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>
|
|
||||||
|
|
||||||
<?php if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
|
echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
|
||||||
<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
|
$columns = get_column_headers('comment');
|
||||||
<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
|
$hidden = (array) get_user_option( 'manage-comment-columns-hidden' );
|
||||||
<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
|
foreach ( $columns as $column_name => $column_display_name ) {
|
||||||
<div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
|
$class = "class=\"$column_name column-$column_name\"";
|
||||||
<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
|
$style = '';
|
||||||
// TODO: I don't think checkboxes really matter anymore
|
if ( in_array($column_name, $hidden) )
|
||||||
// if ( $checkbox && current_user_can( 'edit_post', $comment->comment_post_ID ) )
|
$style = ' style="display:none;"';
|
||||||
// echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
|
|
||||||
?>
|
|
||||||
|
|
||||||
<?php
|
$attributes = "$class$style";
|
||||||
$actions = array();
|
|
||||||
|
|
||||||
if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
|
switch ($column_name) {
|
||||||
$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>';
|
case 'cb':
|
||||||
$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 ( !$checkbox ) break;
|
||||||
if ( $comment_status ) { // not looking at all comments
|
echo '<th scope="row" class="check-column">';
|
||||||
if ( 'approved' == $the_comment_status ) {
|
if ( current_user_can('edit_post', $comment->comment_post_ID) ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
|
||||||
$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>';
|
echo '</th>';
|
||||||
unset($actions['approve']);
|
break;
|
||||||
} else {
|
case 'comment':
|
||||||
$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>';
|
echo "<td $attributes>";
|
||||||
unset($actions['unapprove']);
|
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&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 = ' | ';
|
||||||
|
|
||||||
|
// 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 '&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 ""$post_link" ";
|
||||||
|
echo '<a href="edit-comments.php?p=' . $post->ID;
|
||||||
|
if ( !empty($_GET['comment_type']) ) echo '&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 ( 'spam' != $the_comment_status )
|
echo "</tr>\n";
|
||||||
$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&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>";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<span class="sepa">—</span> <?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;">¶</a> <?php echo $post_link; ?>
|
|
||||||
</li>
|
|
||||||
<?php
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1933,7 +1972,7 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
|
||||||
* @param unknown_type $checkbox
|
* @param unknown_type $checkbox
|
||||||
* @param unknown_type $mode
|
* @param unknown_type $mode
|
||||||
*/
|
*/
|
||||||
function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = false) {
|
function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
|
||||||
global $current_user;
|
global $current_user;
|
||||||
|
|
||||||
// allow plugin to replace the popup content
|
// allow plugin to replace the popup content
|
||||||
|
@ -1948,7 +1987,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
|
||||||
<?php if ( $table_row ) : ?>
|
<?php if ( $table_row ) : ?>
|
||||||
<table style="display:none;"><tbody id="com-reply"><tr id="replyrow"><td colspan="6">
|
<table style="display:none;"><tbody id="com-reply"><tr id="replyrow"><td colspan="6">
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
<ul id="com-reply" style="display:none;"><li id="replyrow">
|
<div id="com-reply" style="display:none;"><div id="replyrow">
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
|
<div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
|
||||||
|
|
||||||
|
@ -1996,7 +2035,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
|
||||||
<?php if ( $table_row ) : ?>
|
<?php if ( $table_row ) : ?>
|
||||||
</td></tr></tbody></table>
|
</td></tr></tbody></table>
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
</li></ul>
|
</div></div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</form>
|
</form>
|
||||||
<?php
|
<?php
|
||||||
|
@ -2789,7 +2828,7 @@ function find_posts_div($found_action = '') {
|
||||||
<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
|
<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
|
||||||
<label class="hidden" for="find-posts-input"><?php _e( 'Search' ); ?></label>
|
<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="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" />
|
<input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
|
||||||
<label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
|
<label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
|
||||||
|
@ -2799,7 +2838,7 @@ function find_posts_div($found_action = '') {
|
||||||
<div id="find-posts-response"></div>
|
<div id="find-posts-response"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="find-box-buttons">
|
<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'); ?>" />
|
<input id="find-posts-submit" type="submit" class="button" value="<?php _e('Select'); ?>" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -88,7 +88,9 @@ $(document).ready(function(){
|
||||||
commentReply = {
|
commentReply = {
|
||||||
|
|
||||||
init : function() {
|
init : function() {
|
||||||
this.rows = $('#the-comment-list li');
|
this.rows = $('#the-comment-list tr');
|
||||||
|
if ( !this.rows.size() )
|
||||||
|
this.rows = $('#the-comment-list > div.comment-item');
|
||||||
var row = $('#replyrow');
|
var row = $('#replyrow');
|
||||||
|
|
||||||
$('a.cancel', row).click(function() { return commentReply.revert(); });
|
$('a.cancel', row).click(function() { return commentReply.revert(); });
|
||||||
|
@ -147,7 +149,7 @@ commentReply = {
|
||||||
t.close();
|
t.close();
|
||||||
t.o = '#comment-'+id;
|
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 editRow = $('#replyrow'), rowData = $('#inline-'+id);
|
||||||
var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
|
var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
|
||||||
|
|
||||||
|
|
|
@ -287,7 +287,7 @@ jQuery(document).ready( function($) {
|
||||||
$.post('admin-ajax.php', data,
|
$.post('admin-ajax.php', data,
|
||||||
function(r) {
|
function(r) {
|
||||||
var r = wpAjax.parseAjaxResponse(r);
|
var r = wpAjax.parseAjaxResponse(r);
|
||||||
$('#commentstatusdiv .comments-box').show();
|
$('#commentstatusdiv .widefat').show();
|
||||||
$('.waiting').hide();
|
$('.waiting').hide();
|
||||||
|
|
||||||
if ( 'object' == typeof r && r.responses[0] ) {
|
if ( 'object' == typeof r && r.responses[0] ) {
|
||||||
|
@ -308,7 +308,7 @@ jQuery(document).ready( function($) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#the-comment-list').append('<li>'+wpAjax.broken+'</li>');
|
$('#the-comment-list').append('<tr><td colspan="5">'+wpAjax.broken+'</td></tr>');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -415,13 +415,21 @@ if ( 1 == count($posts) && is_singular() ) :
|
||||||
|
|
||||||
<br class="clear" />
|
<br class="clear" />
|
||||||
|
|
||||||
<ol id="the-comment-list" class="list:comment">
|
<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">
|
||||||
<?php
|
<?php
|
||||||
foreach ($comments as $comment)
|
foreach ($comments as $comment)
|
||||||
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
|
_wp_comment_row( $comment->comment_ID, 'detail', false, false );
|
||||||
?>
|
?>
|
||||||
</ol>
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
wp_comment_reply();
|
wp_comment_reply();
|
||||||
|
|
|
@ -1925,29 +1925,9 @@ body.wp-admin {
|
||||||
margin: -5px 0 0 10px;
|
margin: -5px 0 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#the-comment-list {
|
#the-comment-list td.comment p.comment-author {
|
||||||
list-style: none;
|
margin-top: 0;
|
||||||
margin: 0;
|
margin-left: 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 {
|
#the-comment-list p.comment-author img {
|
||||||
|
@ -1959,6 +1939,22 @@ body.wp-admin {
|
||||||
border: none;
|
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 {
|
#templateside ul li a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
@ -2249,10 +2245,7 @@ fieldset {
|
||||||
|
|
||||||
/* reply to comments */
|
/* reply to comments */
|
||||||
#replyrow {
|
#replyrow {
|
||||||
border-width: 1px;
|
|
||||||
border-style: solid;
|
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
margin: 0 0 12px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#replyrow input {
|
#replyrow input {
|
||||||
|
@ -2912,9 +2905,3 @@ abbr.required {
|
||||||
.setting-description {
|
.setting-description {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comments-box {
|
|
||||||
margin: 12px 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue