Updated admin statistics

git-svn-id: https://code.elgg.org/elgg/trunk@1752 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 22 insertions, 11 deletions

diff --git a/views/default/admin/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php
index b249db830..212ef5728 100644
--- a/views/default/admin/statistics_opt/basic.php
+++ b/views/default/admin/statistics_opt/basic.php
@@ -18,15 +18,15 @@
 	
 	include_once($CONFIG->path . "version.php");
 ?>
-<div>
+<div class="admin_statistics">
     <h2><?php echo elgg_echo('admin:statistics:label:basic'); ?></h2>
     <table>
     	<tr>
-            <td><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
+            <td style="width: 250px"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
             <td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
         </tr>
         <tr>
-            <td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
+            <td style="width: 250px"><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
             <td><?php echo $users_stats; ?></td>
         </tr>
 
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
index a424b78cf..20a2168fb 100644
--- a/views/default/admin/statistics_opt/numentities.php
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -14,22 +14,33 @@
 	// Get entity statistics
 	$entity_stats = get_entity_statistics();
 ?>
-<div>    
+<div class="admin_statistics">
     <h2><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h2>
     <table>
         <?php
             foreach ($entity_stats as $k => $entry)
-            {
+            {

+            	arsort($entry);
                 foreach ($entry as $a => $b)
                 {
-                    if ($a == "__base__") 
-                        $a=$k;
-                    else
-                        $a = "$k $a";
+                    if ($a == "__base__") {

+                    	$a = elgg_echo("item:{$k}");

+                    	if (empty($a)) 
+                        	$a = $k;

+                    }
+                    else {

+                    		if (empty($a))

+                    			$a = elgg_echo("item:{$k}");

+                    		else
+                				$a = elgg_echo("item:{$k}:{$a}");

+                    		if (empty($a)) {

+								$a = "$k $a";

+                    		}

+                    	  }
                     echo <<< END
                         <tr>
-                            <td><b>$a :</b></td>
-                            <td>$b</td>
+                            <td style="width: 250px">{$a}:</td>
+                            <td>{$b}</td>
                         </tr>
 END;
                 }