- Moved statistics to their own component views. Yay.

Marcus Povey

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

4 files changed, 88 insertions, 59 deletions

diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php
index 984205c8f..4c2035f0d 100644
--- a/views/default/admin/statistics.php
+++ b/views/default/admin/statistics.php
@@ -14,62 +14,4 @@
 	
 	echo "<p>" . nl2br(elgg_echo("admin:statistics:description")) . "</p>";
          
-        
-        
-        // Get entity statistics
-        $entity_stats = get_entity_statistics();
-                 
-        // Work out number of users
-        $users_stats = get_number_users();
-        
-        // users online
-        $users_online = get_number_online();
-        
-        
-	
-?>
-<div>
-    <h2><?php echo elgg_echo('admin:statistics:label:basic'); ?></h2>
-    <table>
-        <tr>
-            <td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
-            <td><?php echo $users_stats; ?></td>
-        </tr>
-        <tr>
-            <td><b><?php echo elgg_echo('admin:statistics:label:numonline'); ?> :</b></td>
-            <td><?php echo $users_online; ?></td>
-        </tr>
-    </table> 
-</div>   
-
-<div>    
-    <h2><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h2>
-    <table>
-        <?php
-            foreach ($entity_stats as $k => $entry)
-            {
-                echo "<table>";
-                foreach ($entry as $a => $b)
-                {
-                    if ($a == "__base__") 
-                        $a=$k;
-                    else
-                        $a = "$k $a";
-                    echo <<< END
-                        <tr>
-                            <td><b>$a :</b></td>
-                            <td>$b</td>
-                        </tr>
-END;
-                }
-                echo "</table>";
-            }
-        ?>
-    </table>
-</div>
-
-<div>
-    <h2><?php echo sprintf(elgg_echo('admin:statistics:label:onlineusers'), 10); ?></h2>
-    
-    
-</div>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php
new file mode 100644
index 000000000..e2d58827b
--- /dev/null
+++ b/views/default/admin/statistics_opt/basic.php
@@ -0,0 +1,28 @@
+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Get entity statistics
+	$entity_stats = get_entity_statistics();
+?>
+<div>
+    <h2><?php echo elgg_echo('admin:statistics:label:basic'); ?></h2>
+    <table>
+        <tr>
+            <td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
+            <td><?php echo $users_stats; ?></td>
+        </tr>
+        <tr>
+            <td><b><?php echo elgg_echo('admin:statistics:label:numonline'); ?> :</b></td>
+            <td><?php echo $users_online; ?></td>
+        </tr>
+    </table> 
+</div>  
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
new file mode 100644
index 000000000..c50949809
--- /dev/null
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Work out number of users
+	$users_stats = get_number_users();
+?>
+<div>    
+    <h2><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h2>
+    <table>
+        <?php
+            foreach ($entity_stats as $k => $entry)
+            {
+                echo "<table>";
+                foreach ($entry as $a => $b)
+                {
+                    if ($a == "__base__") 
+                        $a=$k;
+                    else
+                        $a = "$k $a";
+                    echo <<< END
+                        <tr>
+                            <td><b>$a :</b></td>
+                            <td>$b</td>
+                        </tr>
+END;
+                }
+                echo "</table>";
+            }
+        ?>
+    </table>
+</div>
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
new file mode 100644
index 000000000..2a9532470
--- /dev/null
+++ b/views/default/admin/statistics_opt/online.php
@@ -0,0 +1,19 @@
+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// users online
+	$users_online = get_number_online();
+?>
+
+<div>
+    <h2><?php echo sprintf(elgg_echo('admin:statistics:label:onlineusers'), 10); ?></h2>
+</div>
\ No newline at end of file