Changeset 786541

Timestamp:

10/11/2013 06:41:10 PM (12 years ago)

Author:

lessbloat

Message:

Added Joens "no activity" smiley. Also a few top-level code review nit picks. More full featured code review still coming.

Location:

dashboard/trunk

Files:

• activity.php (modified) (6 diffs)
• css/activity.css (modified) (1 diff)
• css/dash-rwd.css (modified) (1 diff)
• dashboard-override.php (modified) (3 diffs)
• dashboard.php (modified) (1 diff)
• wpnews.php (modified) (1 diff)

dashboard/trunk/activity.php

@@ -12 +12 @@
     echo '<div id="activity-widget">';
 
-    dash_show_published_posts( array(
+    $future_posts = dash_show_published_posts( array(
         'display' => 2,
         'max' => 5,
@@ -19 +19 @@
         'id' => 'future-posts',
     ) );
-    dash_show_published_posts( array(
+    $recent_posts = dash_show_published_posts( array(
         'display' => 2,
         'max' => 5,
@@ -26 +26 @@
         'id' => 'published-posts',
     ) );
-    dash_comments();
+    $recent_comments = dash_comments();
+    
+    if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+        echo '<div class="no-activity">';
+        echo '<p class="smiley"></p>';
+        echo '<p>' . __( 'No activity yet!' ) . '</p>';
+        echo '</div>';
+    }
 
     echo '</div>';
@@ -73 +80 @@
         echo '</div>';
 
+    } else {
+        return false;
     }
 
     wp_reset_postdata();
 
+    return true;
 }
 
@@ -103 +113 @@
     }
     
-    echo '<div id="latest-comments" class="activity-block">';
-    echo '<h4>' . __( 'Comments' ) . '</h4>';
+    
 
     if ( $comments ) {
+        echo '<div id="latest-comments" class="activity-block">';
+        echo '<h4>' . __( 'Comments' ) . '</h4>';
+        
         echo '<div id="the-comment-list" data-wp-lists="list:comment">';
         foreach ( $comments as $comment )
@@ -117 +129 @@
         wp_comment_reply( -1, false, 'dashboard', false );
         wp_comment_trashnotice();
+        
+        echo '</div>';
     } else {
-        echo '<p>' . __( 'No comments yet.' ) . '</p>';
+        return false;
     }
-    
-    echo '</div>';
-
+    return true;
 }
 

dashboard/trunk/css/activity.css

@@ -114 +114 @@
     margin: 4px 0 0 0;
 }
+
+#dashboard_activity .no-activity {
+    overflow: hidden;
+    padding: 0 12px 12px;
+    text-align: center;
+}
+
+#dashboard_activity .no-activity p {
+    color: #999;
+    font-size: 16px;
+}
+
+#dashboard_activity .no-activity .smiley {
+    margin-top: 0;
+}
+
+#dashboard_activity .no-activity .smiley:before {
+    content: '\f328';
+    font: normal 120px/1 'dashicons';
+    speak: none;
+    display: block;
+    margin: 0 5px 0 0;
+    padding: 0;
+    text-indent: 0;
+    text-align: center;
+    position: relative;
+    -webkit-font-smoothing: antialiased;
+    text-decoration: none !important;
+}

dashboard/trunk/css/dash-rwd.css

@@ -67 +67 @@
 }
 
+#dashboard-widgets-wrap {
+    overflow: hidden;
+}
+
 #dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container {
     border: none !important;

dashboard/trunk/dashboard-override.php

@@ -27 +27 @@
 if ( current_user_can( 'install_plugins' ) )
     wp_enqueue_script( 'plugin-install' );
-if ( current_user_can( 'upload_files' ) )
-    wp_enqueue_script( 'media-upload' );
 add_thickbox();
  
@@ -107 +105 @@
  
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php $words = array( 'Hola', 'Bonjour', 'Aloha', 'Ahoy There', "G'day", "It's Go Time", 'Break a Leg', 'Go For Broke' ); echo esc_html( $words[ mt_rand( 0, count( $words) -1 ) ] ); ?></h2>
+    <?php screen_icon(); ?>
+    <h2><?php $words = array( 'Hola', 'Bonjour', 'Aloha', 'Ahoy There', "G'day", "It's Go Time", 'Break a Leg', 'Go For Broke' ); echo esc_html( $words[ mt_rand( 0, count( $words) -1 ) ] ); ?></h2>
  
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+    <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
     $classes = 'welcome-panel';
  
@@ -134 +132 @@
         ?>
     </div>
-<?php endif; ?>
+    <?php endif; ?>
  
-<div id="dashboard-widgets-wrap">
- 
-<?php wp_dashboard(); ?>
- 
-<div class="clear"></div>
-</div><!-- dashboard-widgets-wrap -->
+    <div id="dashboard-widgets-wrap">
+    <?php wp_dashboard(); ?>
+    </div><!-- dashboard-widgets-wrap -->
  
 </div><!-- wrap -->

dashboard/trunk/dashboard.php

@@ -39 +39 @@
                     include $module;
             }
+            
             $this->screen = 'dashboard';
         }

dashboard/trunk/wpnews.php

@@ -3 +3 @@
 // Add the WordPress News widget to the dashboard
 add_action( 'wp_dashboard_setup', 'add_wpnews_dashboard_widget' );
-
 function add_wpnews_dashboard_widget() {
     if ( is_blog_admin() )
+        // Note it would be ideal to have this loaded by default in the right column
+        // Currently there is no way to set a $location arg in wp_add_dashboard_widget()
+        // Would love to add that in core when merging this in.
         wp_add_dashboard_widget( 'dashboard_rss', __( 'WordPress News' ), 'wp_dashboard_rss', 'wp_dashboard_news_feed_control' );
 }