Merged 18_new_admin branch to trunk.

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

6 files changed, 1 insertions, 151 deletions

diff --git a/admin/index.php b/admin/index.php
index 4ee190213..1d41306b6 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -13,4 +13,4 @@ require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
 // Make sure only valid admin users can see this
 admin_gatekeeper();
-forward('pg/admin/statistics/');
\ No newline at end of file
+forward('pg/admin/overview/');
\ No newline at end of file
diff --git a/admin/menu_items.php b/admin/menu_items.php
deleted file mode 100644
index 5642957e1..000000000
--- a/admin/menu_items.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Elgg administration menu items
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-admin_gatekeeper();
-
-$vars = array(
-	'menu_items' => get_register('menu')
-);
-
-$main_box = elgg_view("admin/menu_items", $vars);
-$content = elgg_view_layout("one_column_with_sidebar", $main_box);
-
-page_draw(elgg_echo('admin:plugins'), $content);
\ No newline at end of file
diff --git a/admin/plugins.php b/admin/plugins.php
deleted file mode 100644
index 39478f153..000000000
--- a/admin/plugins.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Elgg administration plugin system index
- * This is a special page that permits the configuration of plugins in a standard way.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-admin_gatekeeper();
-regenerate_plugin_list();
-
-$show_category = get_input('category', NULL);
-
-// Get a list of the all categories
-// and trim down the plugin list if we're not viewing all categories.
-// @todo this could be cached somewhere after have the manifest loaded
-$categories = array();
-$installed_plugins = get_installed_plugins();
-
-foreach ($installed_plugins as $i => $plugin) {
-	$plugin_categories = $plugin['manifest']['category'];
-
-	// handle plugins that don't declare categories
-	if ((!$plugin_categories && $show_category) || ($show_category && !in_array($show_category, $plugin_categories))) {
-		unset($installed_plugins[$i]);
-	}
-
-	foreach ($plugin_categories as $category) {
-		if (!array_key_exists($category, $categories)) {
-			$categories[$category] = elgg_echo("admin:plugins:label:moreinfo:categories:$category");
-		}
-	}
-}
-
-// Display main admin menu
-$vars = array(
-	'installed_plugins' => $installed_plugins,
-	'categories' => $categories,
-	'show_category' => $show_category
-);
-
-$main_box = elgg_view("admin/plugins", $vars);
-$content = elgg_view_layout("one_column_with_sidebar", $main_box);
-
-page_draw(elgg_echo('admin:plugins'), $content);
diff --git a/admin/site.php b/admin/site.php
deleted file mode 100644
index aed952318..000000000
--- a/admin/site.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg administration site system index
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Get the Elgg framework
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-// Make sure only valid admin users can see this
-admin_gatekeeper();
-
-// Display main admin menu
-
-$title = elgg_view_title(elgg_echo('admin:site'));
-$main_box = elgg_view("admin/site");
-$content = elgg_view_layout("one_column_with_sidebar", $title . $main_box);
-
-page_draw(elgg_echo("admin:site"), $content);
\ No newline at end of file
diff --git a/admin/statistics.php b/admin/statistics.php
deleted file mode 100644
index 9823995b5..000000000
--- a/admin/statistics.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg administration statistics index
- * This is a special page that displays a number of statistics
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Get the Elgg framework
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-// Make sure only valid admin users can see this
-admin_gatekeeper();
-
-// Display main admin menu
-$title = elgg_view_title(elgg_echo('admin:statistics'));
-$main_box = elgg_view("admin/statistics");
-$content = elgg_view_layout("one_column_with_sidebar", $title . $main_box);
-
-page_draw(elgg_echo("admin:statistics"), $content);
\ No newline at end of file
diff --git a/admin/user.php b/admin/user.php
deleted file mode 100644
index c0d63d7e0..000000000
--- a/admin/user.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Elgg administration user system index
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Get the Elgg framework
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-// Make sure only valid admin users can see this
-admin_gatekeeper();
-
-// Are we performing a search
-$search = get_input('s');
-$limit = get_input('limit', 10);
-$offset = get_input('offset', 0);
-
-$context = get_context();
-
-$title = elgg_view_title(elgg_echo('admin:user'));
-
-set_context('search');
-
-$result = "<div class='members_list'>".elgg_list_entities(array('type' => 'user', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE))."</div>";
-
-set_context('admin');
-
-// Display main admin menu
-page_draw(elgg_echo("admin:user"),
-	elgg_view_layout("one_column_with_sidebar", $title . elgg_view("admin/user") . $result));