Changeset 7082

Timestamp:

02/28/08 06:50:25 (9 months ago)

Author:

ryan

Message:

Unify comment display. Props mdawaffe. fixes #6025

Files:

• trunk/wp-admin/admin-ajax.php (modified) (2 diffs)
• trunk/wp-admin/edit-comments.php (modified) (7 diffs)
• trunk/wp-admin/edit-pages.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (2 diffs)
• trunk/wp-admin/includes/template.php (modified) (1 diff)
• trunk/wp-admin/js/edit-comments.js (modified) (2 diffs)
• trunk/wp-includes/js/wp-lists.js (modified) (5 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -355 +355 @@
-    $search = isset($_POST['s']) ? $_POST['s'] : false;
-    $start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24;
-
-
+
+
+
+
-
-    if ( !$comments )
@@ -364 +366 @@
-        get_comment( $comment );
-        ob_start();
-list_item( $comment->comment_ID
+row( $comment->comment_ID, $mode
-            $comment_list_item = ob_get_contents();
-        ob_end_clean();

trunk/wp-admin/edit-comments.php

@@ -52 +52 @@
-else
-    $comment_status = '';
+
+if ( isset($_GET['s']) )
+    $search_dirty = $_GET['s'];
+else
+    $search_dirty = '';
+$search = attribute_escape( $search );
-?>
-<?php
@@ -106 +112 @@
-
-<p id="post-search">
-if (isset($_GET['s'])) echo attribute_escape($_GET['s'])
+echo $search
-    <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
-</p>
@@ -112 +118 @@
-<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+</form>
-
-<ul class="view-switch">
@@ -127 +134 @@
-$start = $offset = ( $page - 1 ) * 20;
-
-isset($_GET['s']) ? $_GET['s'] : false
+$search_dirty
-
-$comments = array_slice($_comments, 0, 20);
@@ -140 +147 @@
-
-?>
+
+<form id="comments-form" action="" method="post">
-
-<div class="tablenav">
@@ -176 +185 @@
-<tbody id="the-comment-list" class="list:comment">
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-</table>
+
+</form>
+
+<form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;">
+    <input type="hidden" name="s" value="<?php echo $search; ?>" />
+    <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+    <input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+    <input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" />
+    <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
+</form>
-
-<div id="ajax-response"></div>
@@ -252 +225 @@
-</div>
-
+</div>
+
-<?php include('admin-footer.php'); ?>

trunk/wp-admin/edit-pages.php

@@ -165 +165 @@
-
-<?php
-
+
+
-
-    $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
-$comments) {
+ $comments ) :
-        // Make sure comments, post, and post_author are cached
-        update_comment_cache($comments);
@@ -174 +175 @@
-        $authordata = get_userdata($post->post_author);
-    ?>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-</div>

trunk/wp-admin/edit.php

@@ -185 +185 @@
-    echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-style="clear:both;
-
-
-
-
-{
+class="clear
+
+
+
+
+:
-
-    $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
-$comments) {
+ $comments ) :
-        // Make sure comments, post, and post_author are cached
-        update_comment_cache($comments);
@@ -199 +199 @@
-        $authordata = get_userdata($post->post_author);
-    ?>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/wp-admin/includes/template.php

@@ -593 +593 @@
-}
-
-
-
-
-
-
+
+
+
-    $post = get_post($comment->comment_post_ID);
-    $authordata = get_userdata($post->post_author);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-admin/js/edit-comments.js

@@ -1 @@
-list; var extra
+theList; var theExtraList
-jQuery(function($) {
-
@@ -25 +25 @@
-    });
-
-extra.size() == 0 || extra
+theExtraList.size() == 0 || theExtraList
-        return;
-    }
-
-list[0].wpList.add( extra
+theList.get(0).wpList.add( theExtraList
-    $('#get-extra-comments').submit();
-}
-
-extra
-list = $('#the-comment-list').wpList( { dimAfter : dimAfter, delAfter 
+theExtraList
+theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter
-
-} );

trunk/wp-includes/js/wp-lists.js

@@ -63 +63 @@
-
-    parseClass: function(e,t) {
-
+
+
+
+
+
+
-        return c;
-    },
@@ -88 +93 @@
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'add');
-        s = $.extend(s, {
-            element: s.element || cls[2] || e.attr( 'id' ) || null,
-            addColor: s.addColor || '#' + ( cls[3] || 'FFFF33' )
-        } );
-        s = wpList.pre.call( list, e, s, 'add' );
+
+        s.element = cls[2] || e.attr( 'id' ) || s.element || null;
+        if ( cls[3] ) { s.addColor = '#' + cls[3]; }
+        else { s.addColor = s.addColor || '#FFFF33'; }
+        
-        if ( !s ) { return false; }
-
@@ -151 +157 @@
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'delete');
-        s = $.extend(s, {
-            element: s.element || cls[2] || null,
-            delColor: s.delColor || '#' + ( cls[3] || 'FF3333' )
-        } );
-        s = wpList.pre.call( list, e, s, 'delete' );
+
+        s.element = cls[2] || s.element || null;
+        if ( cls[3] ) { s.delColor = '#' + cls[3]; }
+        else { s.delColor = s.delColor || '#FF3333'; }
+
-        if ( !s || !s.element ) { return false; }
-
@@ -209 +216 @@
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'dim');
-        s = $.extend(s, {
-            element: s.element || cls[2] || null,
-            dimClass: s.dimClass || cls[3] || null,
-            dimAddColor: s.dimAddColor || '#' + ( cls[4] || 'FFFF33' ),
-            dimDelColor: s.dimDelColor || '#' + ( cls[5] || 'FF3333' )
-        } );
-        s = wpList.pre.call( list, e, s, 'dim' );
+
+        s.element = cls[2] || s.element || null;
+        s.dimClass =  cls[3] || s.dimClass || null;
+        if ( cls[4] ) { s.dimAddColor = '#' + cls[4]; }
+        else { s.dimAddColor = s.dimAddColor || '#FFFF33'; }
+        if ( cls[5] ) { s.dimDelColor = '#' + cls[5]; }
+        else { s.dimDelColor = s.dimDelColor || '#FF3333'; }
+
-        if ( !s || !s.element || !s.dimClass ) { return true; }
-
@@ -281 +290 @@
-
-    add: function( e, s ) {
-
+var 
-        e = $(e);
-

trunk/wp-includes/script-loader.php

@@ -62 +62 @@
-        ) );
-
-6
+8
-        $this->localize( 'wp-lists', 'wpListL10n', array(
-            'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'
@@ -126 +126 @@
-                'strong' => __('Strong')
-            ) );
-7
+8
-            $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );
-            $this->add( 'admin-forms', '/wp-admin/js/forms.js', false, '20080108' );