Refactored admin statistics views -- no longer manually building elgg-module

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

diff --git a/views/default/admin/statistics/basic.php b/views/default/admin/statistics/basic.php
new file mode 100644 (file)
index 0000000..2c9b3b8
--- /dev/null
+++ b/views/default/admin/statistics/basic.php
@@ -0,0 +1,19 @@
+<?php
+// Work out number of users
+$users_stats = get_number_users();
+$total_users = get_number_users(true);
+
+// Get version information
+$version = get_version();
+$release = get_version(true);
+?>
+<table class="elgg-table-alt">
+       <tr class="odd">
+               <td><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 class="even">
+               <td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
+               <td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td>
+       </tr>
+</table>
\ No newline at end of file

diff --git a/views/default/admin/statistics/numentities.php b/views/default/admin/statistics/numentities.php
new file mode 100644 (file)
index 0000000..af4ae27
--- /dev/null
+++ b/views/default/admin/statistics/numentities.php
@@ -0,0 +1,40 @@
+<?php
+// Get entity statistics
+$entity_stats = get_entity_statistics();
+$even_odd = "";
+?>             
+<table class="elgg-table-alt">
+<?php
+foreach ($entity_stats as $k => $entry) {
+       arsort($entry);
+       foreach ($entry as $a => $b) {
+
+               //This function controls the alternating class
+               $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+
+               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 class="{$even_odd}">
+                               <td>{$a}:</td>
+                               <td>{$b}</td>
+                       </tr>
+END;
+               }
+       }
+?>
+</table>

diff --git a/views/default/admin/statistics/overview.php b/views/default/admin/statistics/overview.php
index c8cc682d555aa83cf7df4f72b6e12a4d090a0ca7..2f5b25121d764bc25e54d2fd375d395278eb0c5b 100644 (file)
--- a/views/default/admin/statistics/overview.php
+++ b/views/default/admin/statistics/overview.php
@@ -6,81 +6,8 @@
  * @subpackage Core
  */
 
-// Work out number of users
-$users_stats = get_number_users();
-$total_users = get_number_users(true);
-
-// Get version information
-$version = get_version();
-$release = get_version(true);
-
 echo elgg_view('admin/statistics/extend');
 
-?>
-<div class="elgg-module elgg-module-inline">
-       <div class="elgg-head">
-               <h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
-       </div>
-       <div class="elgg-body">
-               <?php //@todo extract this table to a view so we can use elgg_view_module ?>
-               <table class="elgg-table-alt">
-                       <tr class="odd">
-                               <td><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 class="even">
-                               <td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
-                               <td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td>
-                       </tr>
-               </table>
-       </div>
-</div>
-
-<?php
-
-// Get entity statistics
-$entity_stats = get_entity_statistics();
-$even_odd = "";
-?>
-<div class="elgg-module elgg-module-inline">
-       <div class="elgg-head">
-               <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
-       </div>
-       <div class="elgg-body">
-               <?php //@todo extract this table to a view so we can use elgg_view_module ?>
-               <table class="elgg-table-alt">
-               <?php
-                       foreach ($entity_stats as $k => $entry) {
-                               arsort($entry);
-                               foreach ($entry as $a => $b) {
-
-                                       //This function controls the alternating class
-                                       $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
-
-                                       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}");
-                                                       }
+echo elgg_view_module('inline', elgg_echo('admin:statistics:label:basic'), elgg_view('admin/statistics/basic'));
 
-                                                       if (empty($a)) {
-                                                               $a = "$k $a";
-                                                       }
-                                               }
-                                       echo <<< END
-                                               <tr class="{$even_odd}">
-                                                       <td>{$a}:</td>
-                                                       <td>{$b}</td>
-                                               </tr>
-END;
-                               }
-                       }
-               ?>
-               </table>
-       </div>
-</div>
\ No newline at end of file
+echo elgg_view_module('inline', elgg_echo('admin:statistics:label:numentities'), elgg_view('admin/statistics/numentities'));
\ No newline at end of file