Changeset 779738

Timestamp:

09/28/2013 11:08:42 PM (11 years ago)

Author:

lessbloat

Message:

Couple of changes:

• Per Nacin's suggestion, we are overiding the current dashboard with dashboard-override.php
• Couple of CSS tweaks to Kelly's Right now changes. Changed name of that widget to "Site Content". Removed clear divs
• Removed unused dashboard files

Location:

dashboard/trunk

Files:

• css/dashboard.css (deleted)
• css/rightnow.css (modified) (2 diffs)
• dashboard-override.php (added)
• dashboard.php (modified) (3 diffs)
• js/dashboard.js (deleted)
• quickdraft.php (modified) (2 diffs)
• rightnow.php (modified) (3 diffs)

dashboard/trunk/css/rightnow.css

@@ -3 +3 @@
 #dash-right-now .inside {
     margin-bottom: 0;
+    overflow: hidden;
     padding: 0;
 }
@@ -8 +9 @@
 #dash-right-now .main {
     padding: 0 12px;
+}
+
+#dash-right-now .main p {
+    margin-top: 10px;
+}
+
+#dash-right-now ul,
+.mu-storage {
+    overflow: hidden;
 }
 

dashboard/trunk/dashboard.php

@@ -17 +17 @@
 
         private $active_modules = array(
-            'dashboard',
             //'combinednews',
             'quickdraft',
@@ -26 +25 @@
             self::$instance = $this;
             
-            add_action( 'admin_menu', array( $this , 'dash_add_menu' ) );
+            // Override dashboard temporarily
+            add_action( 'load-index.php', array( $this , 'override_dashboard' ) );
+            
+            // Load JS & CSS
             add_action( 'admin_enqueue_scripts', array( $this , 'enqueue_scripts' ) );
             
+            // Load new module files
             foreach ( $this->active_modules as $module_slug ) include plugin_dir_path( __FILE__ ) . $module_slug . '.php';
             $this->screen = 'dashboard';
         }
-        
+
         function enqueue_scripts() {
             if ( get_current_screen()->base !== $this->screen && get_current_screen()->base !== 'dashboard' )
@@ -45 +48 @@
         }
         
-        function dash_add_menu() {
-            $this->screen = add_dashboard_page( 'Dash', 'Dash', 'read', 'dash-dash', array( $this, 'dash_page' ) );
-        }
-        
-        function dash_page() {
-        ?>
-        <div class="wrap">
-
-            <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>
-
-        </div><!-- .wrap -->
-        <?php
-        }
+        function override_dashboard() {
+            if ( get_current_screen()->in_admin( 'site' ) ) {
+                require dirname( __FILE__ ) . '/dashboard-override.php';
+                exit;
+            }
+        }
     }
     new Plugin_Dashboard;

dashboard/trunk/quickdraft.php

@@ -1 +1 @@
 <?php
-
-// Remove the QuickPress widget from the dashboard
-add_action( 'wp_dashboard_setup', 'remove_quickpress_and_recent_drafts_dashboard_widgets' );
-
-function remove_quickpress_and_recent_drafts_dashboard_widgets() {
-    remove_meta_box( 'dashboard_quick_press', 'dashboard', 'side' );
-    remove_meta_box( 'dashboard_recent_drafts', 'dashboard', 'side' );
-}
 
 // Add the QuickDraft widget to the dashboard
@@ -13 +5 @@
 
 function add_quickdraft_dashboard_widget() {
-    if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) { 
-        wp_add_dashboard_widget( 'dashboard_quick_draft', __( 'QuickDraft' ), 'wp_dashboard_quick_draft' );  
-    }   
+    if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+        add_meta_box('dashboard_quick_draft', __( 'Quick Draft' ), 'wp_dashboard_quick_draft', 'dashboard', 'side', 'high');
 }
 

dashboard/trunk/rightnow.php

@@ -39 +39 @@
         </li>
     </ul>
-    <div style="clear:both;"></div>
     </div>
     <?php
@@ -46 +45 @@
 function dash_add_new_right_now() {
     remove_meta_box( 'dashboard_right_now', 'dashboard', 'side' );
-    wp_add_dashboard_widget( 'dash-right-now', 'New Right Now', 'dash_new_right_now' );
+    add_meta_box('dash-right-now', 'Site Content', 'dash_new_right_now', 'dashboard', 'normal', 'high');
     remove_action( 'activity_box_end', 'wp_dashboard_quota' );
     add_action( 'activity_box_end', 'dash_new_dashboard_quota' );
@@ -98 +97 @@
     ?>
     </ul>
-    <div style="clear:both;"></div>
     <p><?php printf( __('<b>WordPress %1$s</b> running %2$s theme.' ), get_bloginfo( 'version', 'display' ), $theme_name ); ?></p>
     </div>