Ticket #20946: 20946.first-pass.diff

wp-admin/includes/dashboard.php

@@ -408 +408 @@
 }
 
 function wp_network_dashboard_right_now() {
+
+        if ( ! wp_is_large_network('users') )
+                $c_users = get_user_count();
+        else
+                $c_users = __( '10,000+' );
+
+        if ( ! wp_is_large_network('sites') )
+                $c_blogs = get_blog_count();            
+        else
+                $c_blogs = __( '10,000+' );
+        
+        $c_plugins = count( get_plugins() );
+        $c_themes = count( wp_get_themes() );   
+
+        echo "\n\t".'<div class="table table_content">';
+        echo "\n\t".'<p class="sub">' . __('Network Totals') . '</p>'."\n\t".'<table>';
+        echo "\n\t".'<tr class="first">';
+
+        // Sites
+        $num = number_format_i18n( $c_blogs );
+        $text = _n( 'Site', 'Sites', $c_blogs );
+        $sites_url = network_admin_url('sites.php');
+                $num = '<a href="' . $sites_url . '">' . $num . '</a>';
+                $text = '<a href=' . $sites_url . '>' . $text . '</a>';
+        echo '<td class="first b b_sites">' . $num . '</td>';
+        echo '<td class="t sites">' . $text . '</td>';
+        
+        echo '</tr><tr>';
+        
+        // Users
+        $num = number_format_i18n( $c_users );
+        $text = _n( 'User', 'Users', $c_users );
+        $count_url = network_admin_url('users');
+                $num = '<a href="' . $count_url . '">' . $num . '</a>';
+                $text = '<a href="' . $count_url . '">' . $text . '</a>';
+        echo '<td class="first b b-users">' . $num . '</td>';
+        echo '<td class="t users">' . $text . '</td>';
+        
+        echo '</tr><tr>';
+        
+        // Themes
+        $num = number_format_i18n( $c_themes );
+        $text = _n( 'Theme', 'Themes', $c_themes );
+        $count_url = network_admin_url('themes.php');
+                $num = '<a href="' . $count_url . '">' . $num . '</a>';
+                $text = '<a href="' . $count_url . '">' . $text . '</a>';
+        echo '<td class="first b b-themes">' . $num . '</td>';
+        echo '<td class="t themes">' . $text . '</td>';
+        
+        echo '</tr><tr>';
+        
+        // Plugins
+        $num = number_format_i18n( $c_plugins );
+        $text = _n( 'Plugin', 'Plugins', $c_plugins );
+        $count_url = network_admin_url('plugins.php');
+                $num = '<a href"' . $count_url . '">' . $num . '</a>';
+                $text = '<a href="' . $count_url . '">' . $text . '</a>';
+        echo '<td class="first b b-plugins">' . $num . '</td>';
+        echo '<td class="t plugins">' . $text . '</td>';
+
+        echo '</tr>';
+
+        do_action( 'mu_right_now_network_table_end' );
+        echo "\n\t</table>\n\t</div>";
+
+        echo "\n\t".'<div class="table table_tools">';
+        echo "\n\t".'<p class="sub">' . __( 'Tools' ) . '</p>'."\n\t".'<table>';
+        echo "\n\t".'<tr class="first">';
+
         $actions = array();
         if ( current_user_can('create_sites') )
                 $actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
         if ( current_user_can('create_users') )
                 $actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
 
-        $c_users = get_user_count();
-        $c_blogs = get_blog_count();
-
-        $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
-        $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
-
-        $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
-
         if ( $actions ) {
                 echo '<ul class="subsubsub">';
                 foreach ( $actions as $class => $action ) {
@@ -430 +491 @@
                 echo implode( " |</li>\n", $actions ) . "</li>\n";
                 echo '</ul>';
         }
+        
+        echo '</tr><tr>'
 ?>
-        <br class="clear" />
 
-        <p class="youhave"><?php echo $sentence; ?></p>
-        <?php do_action( 'wpmuadminresult', '' ); ?>
-
         <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
                 <p>
                         <input type="search" name="s" value="" size="30" autocomplete="off" />
@@ -443 +502 @@
                 </p>
         </form>
 
+        </tr><tr>
+
         <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
                 <p>
                         <input type="search" name="s" value="" size="30" autocomplete="off" />
                         <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
                 </p>
         </form>
+
+        </tr>
 <?php
+        do_action( 'mu_right_now_table_end' );
+        echo "\n\t</table>\n\t</div>";
+
+        echo "\n\t".'<div class="versions">';
+
+        // WordPress Version
+        update_right_now_message();
+
+        echo "\n\t".'<br class="clear" /></div>';
         do_action( 'mu_rightnow_end' );
         do_action( 'mu_activity_box_end' );
+        
+        do_action( 'wpmuadminresult', '' );
 }
 
 function wp_dashboard_quick_press() {

wp-admin/css/wp-admin.dev.css

@@ -653 +653 @@
 #dashboard_plugins h5,
 a.rsswidget,
 #dashboard_right_now td.b,
+#network_dashboard_right_now td.b,
 #dashboard-widgets h4,
 .tool-box .title,
 #poststuff h3,
@@ -4702 +4703 @@
 ------------------------------------------------------------------------------*/
 
 #dashboard_right_now .versions .b,
+#network_dashboard_right_now .versions .b,
 #post-status-display,
 #post-visibility-display,
 #adminmenu .wp-submenu li.current,
@@ -5944 +5946 @@
 
 /* Right Now */
 #dashboard_right_now p.sub,
-#dashboard_right_now .table, #dashboard_right_now .versions {
+#dashboard_right_now .table,
+#dashboard_right_now .versions,
+#network_dashboard_right_now p.sub,
+#network_dashboard_right_now .table,
+#network_dashboard_right_now .versions {
         margin: -12px;
 }
 
-#dashboard_right_now .inside {
+#dashboard_right_now .inside,
+#network_dashboard_right_now .inside {
         font-size: 12px;
         padding-top: 20px;
 }
 
-#dashboard_right_now p.sub {
+#dashboard_right_now p.sub,
+#network_dashboard_right_now p.sub {
         padding: 5px 0 15px;
         color: #8f8f8f;
         font-size: 14px;
@@ -5962 +5970 @@
         left: 15px;
 }
 
-#dashboard_right_now .table {
+#dashboard_right_now .table,
+#network_dashboard_right_now .table {
         margin: 0;
         padding: 0;
         position: relative;
 }
 
-#dashboard_right_now .table_content {
+#dashboard_right_now .table_content,
+#network_dashboard_right_now .table_content {
         float: left;
         border-top: #ececec 1px solid;
         width: 45%;
 }
 
-#dashboard_right_now .table_discussion {
+#dashboard_right_now .table_discussion,
+#network_dashboard_right_now .table_tools {
         float: right;
         border-top: #ececec 1px solid;
         width: 45%;
 }
 
-#dashboard_right_now table td {
+#dashboard_right_now table td,
+#network_dashboard_right_now td {
         padding: 3px 0;
         white-space: nowrap;
 }
 
-#dashboard_right_now table tr.first td {
+#dashboard_right_now table tr.first td,
+#network_dashboard_right_now table tr.first td {
         border-top: none;
 }
 
-#dashboard_right_now td.b {
+#dashboard_right_now td.b,
+#network_dashboard_right_now td.b {
         padding-right: 6px;
         text-align: right;
         font-size: 14px;
         width: 1%;
 }
 
-#dashboard_right_now td.b a {
+#dashboard_right_now td.b a,
+#network_dashboard_right_now td.b a {
         font-size: 18px;
 }
 
-#dashboard_right_now td.b a:hover {
+#dashboard_right_now td.b a:hover,
+#network_dashboard_right_now td.b a:hover {
         color: #d54e21;
 }
 
-#dashboard_right_now .t {
+#dashboard_right_now .t,
+#network_dashboard_right_now .t {
         font-size: 12px;
         padding-right: 12px;
         padding-top: 6px;
         color: #777;
 }
 
-#dashboard_right_now .t a {
+#dashboard_right_now .t a,
+#network_dashboard_right_now .t a {
         white-space: nowrap;
 }
 
@@ -6027 +6045 @@
         color: green;
 }
 
-#dashboard_right_now .versions {
+#dashboard_right_now .versions,
+#network_dashboard_right_now .versions {
         padding: 6px 10px 12px;
         clear: both;
 }
 
-#dashboard_right_now a.button {
+#dashboard_right_now a.button,
+#network_dashboard_right_now a.button {
         float: right;
         clear: right;
         position: relative;