diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index c34e209651..c6aa75d38f 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -29,7 +29,8 @@ div.dashboard-widget, border-color: #ccc; } -.widefat { +.widefat, +#replyrow { border-color: #dfdfdf; } diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index d19bb546f1..f566156143 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -242,32 +242,19 @@ if ( 'spam' == $comment_status ) {
- - - - - - - - - - - - - +
    comment_ID, $mode, $comment_status ); ?> -
- + + -
+
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index c2289ceefe..76aae48322 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -368,17 +368,10 @@ 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" ) ); +?> +
  • +

    +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\""; + + - $style = ''; - if ( in_array($column_name, $hidden) ) - $style = ' style="display:none;"'; +comment_post_ID ) ) +// echo ""; +?> - $attributes = "$class$style"; +'; - 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 ( current_user_can('edit_post', $comment->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']); } } - echo "\n"; + 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"; + } +} +?> +  —  | +
    • +
    -
    -
    + -
    +
    @@ -2838,7 +2799,7 @@ function find_posts_div($found_action = '') {
    - +
    diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index 9792b68fb9..dc0c982d57 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -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'; diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index e3e6d354cf..46bfb258bd 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 .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(''+wpAjax.broken+''); + $('#the-comment-list').append('
  • '+wpAjax.broken+'
    • '); } ); diff --git a/wp-admin/upload.php b/wp-admin/upload.php index e1efbf738b..24752cfd98 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -415,21 +415,13 @@ if ( 1 == count($posts) && is_singular() ) :
    - - - - - - - - - +
      comment_ID, 'detail', false, false ); ?> -
    -
    + +