From de3b6654ddc28fe0fc7d6e1fb615ddb4fd3e3e47 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 24 Jan 2011 02:02:46 +0000
Subject: welcome to the admin dashboard

git-svn-id: http://code.elgg.org/elgg/trunk@7922 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/admin/dashboard.php           | 11 ++++
 views/default/admin/overview/statistics.php | 84 -----------------------------
 views/default/admin/statistics/overview.php | 77 ++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 84 deletions(-)
 create mode 100644 views/default/admin/dashboard.php
 delete mode 100644 views/default/admin/overview/statistics.php
 create mode 100644 views/default/admin/statistics/overview.php

(limited to 'views/default/admin')

diff --git a/views/default/admin/dashboard.php b/views/default/admin/dashboard.php
new file mode 100644
index 000000000..57e15308d
--- /dev/null
+++ b/views/default/admin/dashboard.php
@@ -0,0 +1,11 @@
+<?php
+
+elgg_set_page_owner_guid(get_loggedin_userid());
+
+$params = array(
+	'num_columns' => 2,
+	'exact_match' => true,
+);
+$widgets = elgg_view_layout('widgets', $params);
+
+echo $widgets;
\ No newline at end of file
diff --git a/views/default/admin/overview/statistics.php b/views/default/admin/overview/statistics.php
deleted file mode 100644
index 52bd4ddb2..000000000
--- a/views/default/admin/overview/statistics.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Elgg statistics screen
- *
- * @package Elgg
- * @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-inline-module">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<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-inline-module">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<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>
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/default/admin/statistics/overview.php b/views/default/admin/statistics/overview.php
new file mode 100644
index 000000000..09678fc9a
--- /dev/null
+++ b/views/default/admin/statistics/overview.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Elgg statistics screen
+ *
+ * @package Elgg
+ * @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);
+
+?>
+<div class="admin_settings site_stats">
+	<?php echo elgg_view('overview/extend'); ?>
+	<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
+	<table class="styled">
+		<tr class="odd">
+			<td class="column-one"><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 class="column-one"><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>
+
+<?php
+
+
+// Get entity statistics
+$entity_stats = get_entity_statistics();
+$even_odd = "";
+?>
+<div class="admin_settings site_entities">
+	<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
+	<table class="styled">
+		<?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 class="column-one">{$a}:</td>
+							<td>{$b}</td>
+						</tr>
+END;
+				}
+			}
+		?>
+	</table>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3