Changeset 8288

Timestamp:

07/08/2008 08:00:15 PM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: comments on this post meta box

Location:

branches/crazyhorse/wp-admin

Files:

• edit-form-advanced.php (modified) (3 diffs)
• edit.php (modified) (2 diffs)
• includes/template.php (modified) (2 diffs)
• wp-admin.css (modified) (2 diffs)

branches/crazyhorse/wp-admin/edit-form-advanced.php

@@ -111 +111 @@
 
 ?>
+<p class="meta-options">
+    <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label>
+</p>
 <p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
@@ -117 +120 @@
     echo $pings;
 }
-add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');
+add_meta_box('trackbacksdiv', __('Trackbacks and Pings'), 'post_trackback_meta_box', 'post', 'normal', 'core');
 
 function post_custom_meta_box($post) {
@@ -142 +145 @@
 
 function post_comment_status_meta_box($post) {
+    global $wpdb, $post_ID;
 ?>
 <input name="advanced_view" type="hidden" value="1" />
-<p><label for="comment_status" class="selectit">
-<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label></p>
-<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
-<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
-<?php
-}
-add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
+<p class="meta-options">
+    <label for="comment_status" class="selectit"> <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /><?php _e('Allow comments on this post') ?></label>
+</p>
+<?php
+
+
+    if ( !$post_ID || $post_ID < 0 )
+        return;
+
+    if ( !$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $post_ID) ) )
+        return;
+
+    // Make sure comments, post, and post_author are cached
+//  update_comment_cache($comments);
+?>
+
+<table class="widefat">
+<thead>
+    <tr>
+        <th scope="col"><?php _e('Comments') ?></th>
+        <th scope="col"><?php _e('Submitted') ?></th>
+    </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+    foreach ($comments as $comment)
+        _wp_comment_row( $comment, 'single', false, false );
+?>
+</tbody>
+</table>
+
+
+<?php
+
+
+
+}
+add_meta_box('commentstatusdiv', __('Comments on this Post'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
 
 function post_password_meta_box($post) {

branches/crazyhorse/wp-admin/edit.php

@@ -249 +249 @@
   <tr>
     <th scope="col"><?php _e('Comment') ?></th>
-    <th scope="col"><?php _e('Date') ?></th>
-    <th scope="col"><?php _e('Actions') ?></th>
+    <th scope="col"><?php _e('Submitted') ?></th>
   </tr>
 </thead>
@@ -256 +255 @@
 <?php
     foreach ($comments as $comment)
-        _wp_comment_row( $comment->comment_ID, 'detail', false, false );
+        _wp_comment_row( $comment->comment_ID, 'single', false, false );
 ?>
 </tbody>

branches/crazyhorse/wp-admin/includes/template.php

@@ -742 +742 @@
 <?php endif; ?>
     <td class="comment">
-    <?php if ( 'detail' == $mode ) comment_text(); ?>
+    <?php if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
     <p class="comment-author"><strong><?php comment_author(); ?></strong> |
     <?php if ( !empty($author_url) ) : ?>
@@ -785 +785 @@
     </td>
     <td><?php comment_date(__('Y/m/d \a\t g:ia')); ?></td>
+<?php if ( 'single' !== $mode ) : ?>
     <td>
     "<?php echo $post_link ?>" <?php echo sprintf('(%s comments)', $post->comment_count); ?><br/>
     <?php echo get_the_time(__('Y/m/d \a\t g:ia')); ?>
-    </td>
+    </td>
+<?php endif; ?>
   </tr>
     <?php

branches/crazyhorse/wp-admin/wp-admin.css

@@ -1492 +1492 @@
 }
 
-#the-comment-list td.comment p {
-    margin-left: 8px;
-}
-
 #the-comment-list .check-column {
     padding-top: 8px;
@@ -1646 +1642 @@
     margin: 0;
 }
+
+p.meta-options {
+    border: 1px solid;
+    padding: 1em .5em;
+}