Applied patch in #590 by momo360modena and fixed a minor bug with blog searching

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1237 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 32 insertions, 8 deletions

diff --git a/wp-admin/wpmu-admin.php b/wp-admin/wpmu-admin.php
index 3079ea0..ac70271 100644
--- a/wp-admin/wpmu-admin.php
+++ b/wp-admin/wpmu-admin.php
@@ -3,28 +3,48 @@ require_once('admin.php');
 
 $title = __('WordPress MU › Admin');
 $parent_file = 'wpmu-admin.php';
+
+function index_css() {
+	wp_admin_css( 'css/dashboard' );
+}
+add_action( 'admin_head', 'index_css' );
+
 require_once('admin-header.php');
 
 if( is_site_admin() == false ) {
 	wp_die( __('<p>You do not have permission to access this page.</p>') );
 }
 
-if (isset($_GET['updated'])) {
-	?>
-	<div id="message" class="updated fade"><p><?php _e('Options saved.') ?></p></div>
-	<?php
-}
+global $wpdb;
+$c_users = $wpdb->get_var("SELECT COUNT(id) FROM {$wpdb->users}");
+$c_blogs = $wpdb->get_var("SELECT COUNT(blog_id) FROM {$wpdb->blogs}");
+
+$user_text = sprintf( __ngettext( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
+$blog_text = sprintf( __ngettext( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
+
+$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
 ?>
 
 <div class="wrap">
 	<h2><?php _e('WordPress MU : Admin') ?></h2>
+	
+	<div id="rightnow">
+	<h3 class="reallynow">
+		<span><?php _e('Right Now'); ?></span>
+		
+		<a href="wpmu-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a>
+		<a href="wpmu-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a>
+		<br class="clear" />
+	</h3>
+	
+	<p class="youhave"><?php echo $sentence; ?></p>	
 	<?php do_action('wpmuadminresult', ''); ?>
 	
 	<form name="searchform" action="wpmu-users.php" method="get">
 		<p>
 			<input type="hidden" name="action" value="users" />
 			<input type="text" name="s" value="" size="17" /> 
-			<input type="submit" name="submit" value="<?php _e("Search Users &raquo;"); ?>" />
+			<input class="button" type="submit" name="submit" value="<?php _e("Search Users &raquo;"); ?>" />
 		</p> 
 	</form>
 		
@@ -32,9 +52,13 @@ if (isset($_GET['updated'])) {
 		<p>
 			<input type="hidden" name="action" value="blogs" />
 			<input type="text" name="s" value="" size="17" />
-			<input type="submit" name="submit" value="<?php _e("Search Blogs &raquo;"); ?>" />
+			<input class="button" type="submit" name="blog_name" value="<?php _e("Search Blogs &raquo;"); ?>" />
 		</p>
 	</form>
+	
+	<?php do_action( 'mu_rightnow_end' ); ?>
+	<?php do_action( 'mu_activity_box_end' ); ?>
+	</div><!-- rightnow -->
 </div>
 
-<?php include('admin-footer.php'); ?>
\ No newline at end of file
+<?php include('admin-footer.php'); ?>