diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 6a286b6db8..bfd472f722 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -520,11 +520,6 @@ input.readonly { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 03ddf4352e..c39298ab36 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -508,11 +508,6 @@ input.readonly { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index cd368ea82c..e8fd173525 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -96,6 +96,21 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp } ?>
+ +
+
+
+ +
+
+
+
+ +
+
+ +
+

@@ -208,13 +223,9 @@ if ($comments) { ?> - - - - - - - + + + '', + 'comment' => __('Comment'), + 'author' => __('Author'), + 'date' => __('Submitted'), + 'response' => __('In Response To This Post') + ); + + return apply_filters('manage_comments_columns', $columns); case 'link': $columns = array( 'cb' => '', @@ -1587,76 +1597,96 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true $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" ) ); -?> - - - - - "; + $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) ) { - $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') . ''; - if ( 'spam' != $the_comment_status ) - $actions['reply'] = '' . __('Reply') . ''; + $attributes = "$class$style"; - $actions = apply_filters( 'comment_row_actions', $actions, $comment ); + switch ($column_name) { + case 'cb': + if ( !$checkbox ) break; + echo ''; + break; + case 'comment': + echo "'; + break; + case 'author': + echo "'; + break; + case 'date': + echo "'; + break; + case 'response': + if ( 'single' !== $mode ) + echo "'; } } - ?> - - - - - - - - \n"; } function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single') { @@ -2292,7 +2322,7 @@ function manage_columns_prefs($page) { foreach ( $columns as $column => $title ) { // Can't hide these - if ( 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column ) + if ( 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column ) continue; if ( empty($title) ) continue; diff --git a/wp-admin/js/categories.js b/wp-admin/js/categories.js index c90733d4f3..88d7a04175 100644 --- a/wp-admin/js/categories.js +++ b/wp-admin/js/categories.js @@ -26,25 +26,4 @@ jQuery(function($) { } else { columns.init('category'); } - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index a4584fad5a..584eae34f6 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -231,6 +231,8 @@ commentReply = { }; $(document).ready(function(){ + columns.init('comment'); + if ( typeof QTags != 'undefined' ) ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more'); diff --git a/wp-admin/js/link.js b/wp-admin/js/link.js index 2923059dd7..1dda1744b0 100644 --- a/wp-admin/js/link.js +++ b/wp-admin/js/link.js @@ -48,25 +48,4 @@ jQuery(document).ready( function($) { return false; } ); jQuery('.categorychecklist :checkbox').change( syncChecks ).filter( ':checked' ).change(); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); diff --git a/wp-admin/js/links.js b/wp-admin/js/links.js index 6fccc4c734..63fad2e6cb 100644 --- a/wp-admin/js/links.js +++ b/wp-admin/js/links.js @@ -1,24 +1,3 @@ jQuery(document).ready( function($) { columns.init('link'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); \ No newline at end of file diff --git a/wp-admin/js/media.js b/wp-admin/js/media.js index a2db43ce4e..d3b77b80b3 100644 --- a/wp-admin/js/media.js +++ b/wp-admin/js/media.js @@ -1,24 +1,3 @@ jQuery(document).ready( function($) { columns.init('media'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); diff --git a/wp-admin/js/page.js b/wp-admin/js/page.js index 3949c339ee..f8f68419b9 100644 --- a/wp-admin/js/page.js +++ b/wp-admin/js/page.js @@ -48,27 +48,6 @@ jQuery(document).ready( function($) { return false; }); - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); - $('.edit-post-status').click(function() { if ($('#post-status-select').is(":hidden")) { $('#post-status-select').slideDown("normal"); diff --git a/wp-admin/js/pages.js b/wp-admin/js/pages.js index 572864de39..ae1e493d48 100644 --- a/wp-admin/js/pages.js +++ b/wp-admin/js/pages.js @@ -1,24 +1,3 @@ jQuery(document).ready( function($) { columns.init('page'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); \ No newline at end of file diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index 534c3d3997..15d58c7f4f 100644 --- a/wp-admin/js/post.js +++ b/wp-admin/js/post.js @@ -192,27 +192,6 @@ jQuery(document).ready( function($) { return false; }); - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); - // Custom Fields jQuery('#the-list').wpList( { addAfter: function( xml, s ) { if ( jQuery.isFunction( autosave_update_post_ID ) ) { diff --git a/wp-admin/js/posts.js b/wp-admin/js/posts.js index d76ec3f134..48cb0e5860 100644 --- a/wp-admin/js/posts.js +++ b/wp-admin/js/posts.js @@ -1,24 +1,3 @@ jQuery(document).ready( function($) { columns.init('post'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); \ No newline at end of file diff --git a/wp-admin/js/settings-box.js b/wp-admin/js/settings-box.js new file mode 100644 index 0000000000..04f8085d66 --- /dev/null +++ b/wp-admin/js/settings-box.js @@ -0,0 +1,21 @@ +jQuery(document).ready( function($) { + $('#show-settings-link').click(function () { + $('#edit-settings').slideDown('normal', function(){ + $('#show-settings-link').hide(); + $('#hide-settings-link').show(); + + }); + $('#show-settings').addClass('show-settings-opened'); + return false; + }); + + $('#hide-settings-link').click(function () { + $('#edit-settings').slideUp('normal', function(){ + $('#hide-settings-link').hide(); + $('#show-settings-link').show(); + $('#show-settings').removeClass('show-settings-opened'); + }); + + return false; + }); +}); \ No newline at end of file diff --git a/wp-admin/js/tags.js b/wp-admin/js/tags.js index 9f7c4a46d5..d54e6c2a9b 100644 --- a/wp-admin/js/tags.js +++ b/wp-admin/js/tags.js @@ -20,25 +20,4 @@ jQuery(function($) { $('#the-list').wpList(); columns.init('tag'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); -}); +}); \ No newline at end of file diff --git a/wp-admin/js/users.js b/wp-admin/js/users.js index 071fb8cbe4..eaf6d3aa94 100644 --- a/wp-admin/js/users.js +++ b/wp-admin/js/users.js @@ -2,25 +2,4 @@ jQuery( function($) { $('#users').wpList(); columns.init('user'); - - // Edit Settings - $('#show-settings-link').click(function () { - $('#edit-settings').slideDown('normal', function(){ - $('#show-settings-link').hide(); - $('#hide-settings-link').show(); - - }); - $('#show-settings').addClass('show-settings-opened'); - return false; - }); - - $('#hide-settings-link').click(function () { - $('#edit-settings').slideUp('normal', function(){ - $('#hide-settings-link').hide(); - $('#show-settings-link').show(); - $('#show-settings').removeClass('show-settings-opened'); - }); - - return false; - }); }); diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 7cff594b63..101118f089 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -512,20 +512,20 @@ p.pagenav { font-weight: bold; } -.comment-column p { +.column-comment p { margin-top: 0; } -.comment-column { +.column-comment { width: 50%; } -.author-column, -.response-column { +.column-author, +.column-response { width: 20%; } -.author-column img { +.column-author img { float: left; margin-right: 10px; margin-top: 3px; @@ -1665,15 +1665,6 @@ ul.view-switch li.current { border-top-right-radius: 3px; } - -#the-comment-list .comment a { - padding-bottom: 1px; - text-decoration: none; - border-bottom-width: 1px; - border-bottom-style: solid; -} - - #the-comment-list td.comment p.comment-author { margin-top: 0; margin-left: 0; @@ -1693,8 +1684,10 @@ ul.view-switch li.current { } #the-comment-list td.comment { +/* width: 65%; max-width: 460px; +*/ word-wrap: break-word; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index d7ca0a6571..c6746ebf22 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -149,8 +149,8 @@ function wp_default_scripts( &$scripts ) { 'add' => attribute_escape(__('Add')), 'how' => __('Separate multiple categories with commas.') ) ); - $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists', 'columns'), '20071031' ); - $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists', 'columns'), '20080918' ); + $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists', 'columns', 'settings-box'), '20080925' ); + $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists', 'columns', 'settings-box'), '20080925' ); $scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' ); $scripts->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20080824' ); $scripts->localize( 'password-strength-meter', 'pwsL10n', array( @@ -160,13 +160,13 @@ function wp_default_scripts( &$scripts ) { 'good' => __('Medium'), 'strong' => __('Strong') ) ); - $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-draggable', 'jquery-ui-resizable', 'quicktags'), '20080905' ); + $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-draggable', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20080925' ); $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( 'pending' => __('%i% pending'), // must look like: "# blah blah" 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']), ) ); - $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists', 'columns'), '20080918' ); + $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists', 'columns', 'settings-box'), '20080925' ); $scripts->add( 'admin-forms', '/wp-admin/js/forms.js', array('jquery'), '20080729'); $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' ); $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' ); @@ -180,7 +180,7 @@ function wp_default_scripts( &$scripts ) { 'save' => __('Save'), 'cancel' => __('Cancel'), ) ); - $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080701' ); + $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20080925' ); $scripts->localize( 'post', 'postL10n', array( 'tagsUsed' => __('Tags used on this post:'), 'add' => attribute_escape(__('Add')), @@ -189,12 +189,12 @@ function wp_default_scripts( &$scripts ) { 'cancel' => __('Cancel'), 'edit' => __('Edit'), ) ); - $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox'), '20080318' ); + $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox', 'settings-box'), '20080925' ); $scripts->localize( 'page', 'postL10n', array( 'cancel' => __('Cancel'), 'edit' => __('Edit'), ) ); - $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20080131' ); + $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox', 'settings-box'), '20080925' ); $scripts->add( 'comment', '/wp-admin/js/comment.js', array('postbox'), '20080219' ); $scripts->localize( 'comment', 'commentL10n', array( 'cancel' => __('Cancel'), @@ -263,15 +263,17 @@ function wp_default_scripts( &$scripts ) { 'time' => time() ) ); - $scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns'), '20080910' ); - $scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns'), '20080910' ); - $scripts->add( 'links', '/wp-admin/js/links.js', array('columns'), '20080913' ); - $scripts->add( 'media', '/wp-admin/js/media.js', array('columns'), '20080915' ); + $scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns', 'settings-box'), '20080925' ); + $scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns', 'settings-box'), '20080925' ); + $scripts->add( 'links', '/wp-admin/js/links.js', array('columns', 'settings-box'), '20080925' ); + $scripts->add( 'media', '/wp-admin/js/media.js', array('columns', 'settings-box'), '20080925' ); $scripts->add( 'columns', '/wp-admin/js/columns.js', false, '20080910' ); $scripts->localize( 'columns', 'columnsL10n', array( 'requestFile' => admin_url('admin-ajax.php'), ) ); + + $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20080925' ); } }
comment_post_ID) ) { ?> - + echo "
'; + if ( current_user_can('edit_post', $comment->comment_post_ID) ) echo ""; + echo '"; + if ( 'detail' == $mode || 'single' == $mode ) comment_text(); - $action_count = count($actions); - $i = 0; - foreach ( $actions as $action => $link ) { - ++$i; - ( $i == $action_count ) ? $sep = '' : $sep = ' | '; - // The action before reply shouldn't output a sep - if ( 'edit' == $action ) - $sep = ''; - // Reply needs a hide-if-no-js span - if ( 'reply' == $action ) - echo " | $link$sep"; - else - echo "$link$sep"; + $actions = array(); + + 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']); + } + } + if ( 'spam' != $the_comment_status ) + $actions['spam'] = "" . __( 'Spam' ) . ''; + $actions['delete'] = "" . __('Delete') . ''; + $actions['edit'] = "". __('Edit') . ''; + if ( 'spam' != $the_comment_status ) + $actions['reply'] = '' . __('Reply') . ''; + + $actions = apply_filters( 'comment_row_actions', $actions, $comment ); + + $action_count = count($actions); + $i = 0; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + // The action before reply shouldn't output a sep + if ( 'edit' == $action ) + $sep = ''; + // Reply needs a hide-if-no-js span + if ( 'reply' == $action ) + echo " | $link$sep"; + else + echo "$link$sep"; + } + } + + 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 '		" . get_comment_date(__('Y/m/d \a\t g:ia')) . '"$post_link" " . sprintf('(%s comments)', $post->comment_count) . '
' . get_the_time(__('Y/m/d \a\t g:ia')) . '		 -
- -
- - ID ) ) : ?> - comment_author_email) ): ?> -
- - - - 		- "" comment_count); ?>
- -