Changeset 786069

Timestamp:

10/10/2013 07:41:40 PM (12 years ago)

Author:

lessbloat

Message:

Super rough pass at fleshing out the rest of the activity widget - still needs a fair amount of code refactoring and CSS love.

Location:

dashboard/trunk

Files:

• activity.php (modified) (5 diffs)
• css/activity.css (modified) (1 diff)
• dashboard-override.php (modified) (1 diff)
• js/dash-rwd.js (modified) (1 diff)

dashboard/trunk/activity.php

@@ -5 +5 @@
 function add_activity_dashboard_widget() {
     add_meta_box( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_activity', 'dashboard', 'normal', 'high' );
-    remove_meta_box( 'dashboard_recent_comments', 'dashboard', 'normal' );
 }
 
@@ -13 +12 @@
     echo '<div id="activity-widget">';
 
-    dash_publishing_soon();
-    //dash_comments();
+    dash_show_published_posts( array(
+        'display' => 2,
+        'max' => 5,
+        'status' => 'future',
+        'title' => __( 'Publishing Soon' ),
+        'id' => 'future-posts',
+    ) );
+    dash_show_published_posts( array(
+        'display' => 2,
+        'max' => 5,
+        'status' => 'publish',
+        'title' => __( 'Recently Published' ),
+        'id' => 'published-posts',
+    ) );
+    dash_comments();
 
     echo '</div>';
@@ -20 +32 @@
 }
 
-// show `Publishing Soon` section
-function dash_publishing_soon( $display = 2, $max = 5 ) {
+// Generates `Publishing Soon` and `Recently Published` sections
+function dash_show_published_posts( $args ) {
 
-    $future_posts = new WP_Query(array(
+    $posts = new WP_Query(array(
         'post_type' => 'post',
-        'post_status' => 'future',
+        'post_status' => $args['status'],
         'orderby' => 'date',
         'order' => 'ASC',
-        'posts_per_page' => intval( $max )
+        'posts_per_page' => intval( $args['max'] )
     ));
 
-    if ( $future_posts->have_posts() ) {
+    if ( $posts->have_posts() ) {
 
-        echo '<div id="future-posts">';
-        echo '<strong>' . __( 'Publishing Soon' ) . '</strong>';
+        echo '<div id="' . $args['id'] . '" class="activity-block">';
+        echo $args['title'];
 
-        if ( $future_posts->post_count > $display ) {
-            echo '<small class="show-more"><a href="#">' . sprintf( __( 'See %s more&hellip;'), $future_posts->post_count - intval( $display ) ) . '</a></small>';
+        if ( $posts->post_count > $args['display'] ) {
+            echo '<small class="show-more"><a href="#">' . sprintf( __( 'See %s more&hellip;'), $posts->post_count - intval( $args['display'] ) ) . '</a></small>';
         }
 
@@ -43 +55 @@
 
         $i = 0;
-        while ( $future_posts->have_posts() ) {
-            $future_posts->the_post();
+        while ( $posts->have_posts() ) {
+            $posts->the_post();
             printf(
                 '<li%s><span>%s, %s</span> <a href="%s">%s</a></li>',
-                ( $i >= intval ( $display ) ? ' class="hidden"' : '' ),
+                ( $i >= intval ( $args['display'] ) ? ' class="hidden"' : '' ),
                 dash_relative_date( get_the_time( 'U' ) ),
                 get_the_time(),
@@ -66 +78 @@
 
 // show `Comments` section
-function dash_comments( $display = 5 ) {
+function dash_comments( $total_items = 5 ) {
+    global $wpdb;
 
-    $comments = new WP_Comment_Query(array(
-        'status' => '',
-        'number' => intval( $display )
-    ));
+    // Select all comment types and filter out spam later for better query performance.
+    $comments = array();
+    $start = 0;
 
-    echo '<div id="latest-comments">';
-    echo '<strong>' . __( 'Comments' ) . '</strong>';
+    $comments_query = array( 'number' => $total_items * 5, 'offset' => 0 );
+    if ( ! current_user_can( 'edit_posts' ) )
+        $comments_query['status'] = 'approve';
 
-    echo '</ul>';
+    while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
+        foreach ( $possible as $comment ) {
+            if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+                continue;
+            $comments[] = $comment;
+            if ( count( $comments ) == $total_items )
+                break 2;
+        }
+        $comments_query['offset'] += $comments_query['number'];
+        $comments_query['number'] = $total_items * 10;
+    }
+    
+    echo '<div id="latest-comments" class="activity-block">';
+    _e( 'Comments' );
+
+    if ( $comments ) {
+        echo '<div id="the-comment-list" data-wp-lists="list:comment">';
+        foreach ( $comments as $comment )
+            _wp_dashboard_recent_comments_row( $comment );
+        echo '</div>';
+
+        if ( current_user_can('edit_posts') )
+            _get_list_table('WP_Comments_List_Table')->views();
+
+        wp_comment_reply( -1, false, 'dashboard', false );
+        wp_comment_trashnotice();
+    } else {
+        echo '<p>' . __( 'No comments yet.' ) . '</p>';
+    }
+    
     echo '</div>';
 

dashboard/trunk/css/activity.css

@@ -1 @@
-#future-posts .show-more {
+#dashboard_activity .inside {
+    padding: 0;
+    margin: 0;
+}
+
+#future-posts .show-more,
+#published-posts .show-more {
     float: right;
 }
 
-#future-posts ul {
+#future-posts ul,
+#published-posts ul {
     clear: both;
 }
 
-#future-posts ul span {
+#future-posts li,
+#published-posts li {
+    overflow: hidden;
+}
+
+#future-posts ul span,
+#published-posts ul span {
     color: #aaa;
+    float: left;
+    margin-right: 8px;
+    min-width: 150px;
 }
+
+.activity-block {
+    border-bottom: 1px solid #eee;
+    overflow: hidden;
+    padding: 12px 12px 0;
+}
+
+.activity-block:last-child {
+    border-bottom: none;
+    padding-bottom: 10px;
+}
+
+.activity-block .subsubsub li {
+    color: #ddd;
+}
+
+#the-comment-list .comment {
+    border-left: 4px solid #fff;
+}
+
+#the-comment-list .unapproved {
+    background: none;
+    border-left: 4px solid #f4f290;
+}
+
+#the-comment-list .alternate, 
+#the-comment-list .alt {
+    background: none;
+}

dashboard/trunk/dashboard-override.php

@@ -19 +19 @@
 remove_meta_box( 'dashboard_primary', 'dashboard', 'side' );
 remove_meta_box( 'dashboard_secondary', 'dashboard', 'side' );
+// Remove Recent Comments
+remove_meta_box( 'dashboard_recent_comments', 'dashboard', 'normal' );
  
 wp_enqueue_script( 'dashboard' );

dashboard/trunk/js/dash-rwd.js

@@ -15 +15 @@
     });
 });
+
 jQuery(window).resize( _.debounce( function(){
     updateColumnCount();
 }, 50) );
+
 function updateColumnCount() {
     var cols = 1,