Ticket #12710: 12710.patch

wp-admin/css/ms.dev.css

@@ -49 +49 @@
         background: transparent url('../images/site-admin.png') no-repeat scroll 0px -1px;
 }
 
-/* Dashboard: MU Specific Data */
+/* Dashboard: MS Specific Data */
 #dashboard_right_now p.musub {
         margin-top: 12px;
         border-top: 1px solid #ececec;
         position: static;
 }
 
+#dashboard_right_now div.musubtable {
+        border-top: none;
+}
+
+#dashboard_right_now div.musubtable td.t {
+        white-space: pre-wrap;  
+}
+
 #dashboard_right_now td.b a.musublink {
         font-size: 16px;
 }
+
 tr.site-deleted {
         background:#f55;
 }

wp-admin/includes/ms.php

@@ -450 +450 @@
                 $percentused = ( $used / $quota ) * 100;
         $percentused = number_format($percentused);
         $used = round($used,2);
-        $used_color = ($used < 70) ? (($used >= 40) ? 'waiting' : 'approved') : 'spam';
+        $used_color = ($percentused < 70) ? (($percentused >= 40) ? 'waiting' : 'approved') : 'spam';
         ?>
         <p class="sub musub"><?php _e('Storage Space'); ?></p>
-        <div class="table">
+        <div class="table table_content musubtable">
         <table>
                 <tr class="first">
                         <td class="first b b-posts"><?php printf( __( '<a href="upload.php" title="Manage Uploads" class="musublink">%sMB</a>' ), $quota ); ?></td>
                         <td class="t posts"><?php _e('Space Allowed'); ?></td>
+                </tr>
+        </table>
+        </div>
+        <div class="table table_discussion musubtable">
+        <table>
+                <tr class="first">
                         <td class="b b-comments"><?php printf( __( '<a href="upload.php" title="Manage Uploads" class="musublink">%1sMB (%2s%%)</a>' ), $used, $percentused ); ?></td>
                         <td class="last t comments <?php echo $used_color;?>"><?php _e('Space Used');?></td>
                 </tr>
         </table>
         </div>
+        <br class="clear" />
         <?php
 }
 if ( current_user_can('edit_posts') )