From 166ccef6c3ec990cb550b48449722aa9546ba073 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 30 Oct 2008 15:50:21 +0000 Subject: [PATCH] Revert [9413] git-svn-id: http://svn.automattic.com/wordpress/trunk@9414 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/colors-fresh.css | 3 +- wp-admin/edit-comments.php | 23 ++++- wp-admin/edit-form-advanced.php | 15 ++- wp-admin/edit-pages.php | 13 ++- wp-admin/edit.php | 22 ++++- wp-admin/includes/template.php | 165 ++++++++++++++++++++------------ wp-admin/js/edit-comments.js | 6 +- wp-admin/js/post.js | 4 +- wp-admin/upload.php | 14 ++- wp-admin/wp-admin.css | 51 ++++------ 10 files changed, 199 insertions(+), 117 deletions(-) diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index c6aa75d38f..c34e209651 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -29,8 +29,7 @@ div.dashboard-widget, border-color: #ccc; } -.widefat, -#replyrow { +.widefat { border-color: #dfdfdf; } diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index f566156143..d19bb546f1 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -242,19 +242,32 @@ if ( 'spam' == $comment_status ) {
+ + + + + + -
    +
+ + + + + +comment_ID, $mode, $comment_status ); ?> - - +comment_ID, $mode, $comment_status ); ?> - + +
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 76aae48322..c2289ceefe 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -368,10 +368,17 @@ function post_comment_status_meta_box($post) { wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); ?> - + + + + + + + + + + +

-
    + + + + + + + + +comment_ID, 'detail', false, false ); ?> - + +
    -
      + + + + + + + + + + + + + + + + + +comment_ID, 'single', false, false ); ?> - + +
      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" ) ); -?> -
    1. -

      -ID ) && !empty( $comment->comment_author_email ) ) { echo ' | '; comment_author_email_link(); } ?> -| | #
      -$author_url_display"; ?> -

      - - + echo ""; + $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\""; -comment_post_ID ) ) -// echo ""; -?> + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; -comment_post_ID) ) { - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - if ( $comment_status ) { // not looking at all comments - if ( 'approved' == $the_comment_status ) { - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - unset($actions['approve']); - } else { - $actions['approve'] = "" . __( 'Approve' ) . ''; - unset($actions['unapprove']); + switch ($column_name) { + case 'cb': + if ( !$checkbox ) break; + echo ''; + if ( current_user_can('edit_post', $comment->comment_post_ID) ) echo ""; + echo ''; + break; + case 'comment': + echo ""; + if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?> + + comment_post_ID) ) { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + if ( $comment_status ) { // not looking at all comments + if ( 'approved' == $the_comment_status ) { + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + unset($actions['approve']); + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + unset($actions['unapprove']); + } + } + if ( 'spam' != $the_comment_status ) + $actions['spam'] = "" . __( 'Spam' ) . ''; + $actions['delete'] = "" . __('Delete') . ''; + $actions['edit'] = "". __('Edit') . ''; + $actions['quickedit'] = '' . __('Quick Edit') . ''; + if ( 'spam' != $the_comment_status ) + $actions['reply'] = '' . __('Reply') . ''; + + $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 "$sep$link"; + } + } + + echo ''; + break; + case 'author': + echo ""; comment_author(); echo '
      '; + if ( !empty($author_url) ) + echo "$author_url_display
      "; + if ( current_user_can( 'edit_post', $post->ID ) ) { + if ( !empty($comment->comment_author_email) ) { + comment_author_email_link(); + echo '
      '; + } + echo ''; + comment_author_IP(); + echo ''; + } //current_user_can + echo ''; + break; + case 'date': + echo "" . get_comment_date(__('Y/m/d \a\t g:ia')) . ''; + break; + case 'response': + if ( 'single' !== $mode ) { + echo "\n"; + echo ""$post_link" "; + echo '' . sprintf ( __ngettext('(%s comment)', '(%s comments)', $post->comment_count), $post->comment_count ) . '
      '; + echo get_the_time(__('Y/m/d \a\t g:ia')); + echo ''; + } } } - if ( 'spam' != $the_comment_status ) - $actions['spam'] = "" . __( 'Spam' ) . ''; - $actions['delete'] = "" . __('Delete') . ''; - $actions['edit'] = "". __('Edit') . ''; - $actions['quickedit'] = '' . __('Quick Edit') . ''; - if ( 'spam' != $the_comment_status ) - $actions['reply'] = '' . __('Reply') . ''; - - $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 "$sep$link"; - } -} -?> -  —  | -
      2. -\n"; } /** @@ -1933,7 +1972,7 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) { * @param unknown_type $checkbox * @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; // allow plugin to replace the popup content @@ -1948,7 +1987,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
      -
      - +
-
+
@@ -2799,7 +2838,7 @@ function find_posts_div($found_action = '') {
- +
diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index dc0c982d57..9792b68fb9 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -88,7 +88,9 @@ $(document).ready(function(){ commentReply = { 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'); $('a.cancel', row).click(function() { return commentReply.revert(); }); @@ -147,7 +149,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'; diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index 46bfb258bd..e3e6d354cf 100644 --- a/wp-admin/js/post.js +++ b/wp-admin/js/post.js @@ -287,7 +287,7 @@ jQuery(document).ready( function($) { $.post('admin-ajax.php', data, function(r) { var r = wpAjax.parseAjaxResponse(r); - $('#commentstatusdiv .comments-box').show(); + $('#commentstatusdiv .widefat').show(); $('.waiting').hide(); if ( 'object' == typeof r && r.responses[0] ) { @@ -308,7 +308,7 @@ jQuery(document).ready( function($) { return; } - $('#the-comment-list').append('
  • '+wpAjax.broken+'
    • '); + $('#the-comment-list').append(''+wpAjax.broken+''); } ); diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 24752cfd98..e1efbf738b 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -415,13 +415,21 @@ if ( 1 == count($posts) && is_singular() ) :
    -
      + + + + + + + + +comment_ID, 'detail', false, false ); ?> - - + +