User settings

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

4 files changed, 6 insertions, 37 deletions

diff --git a/settings/index.php b/settings/index.php
index 47cf9caba..5906ca842 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -11,16 +11,9 @@
 	 */
 
 	// Get the Elgg framework
-		require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-	// Make sure only valid users can see this
-		gatekeeper();
-		
-		
-		
-		/// Default settings
-		
+		require_once(dirname(dirname(__FILE__)) . "/engine/start.php");

+		

+	// Forward to the user settings
+		forward('pg/settings/user');

 		
-	// Display main admin menu
-		page_draw(elgg_echo("admin"),elgg_view_layout("one_column", elgg_view("usersettings/main")));
 ?>
\ No newline at end of file
diff --git a/settings/plugins/index.php b/settings/plugins/index.php
deleted file mode 100644
index d45fbd334..000000000
--- a/settings/plugins/index.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-	/**
-	 * Elgg user settings functions.
-	 * 
-	 * @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 the Elgg framework
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	// Make sure only valid admin users can see this
-		gatekeeper();
-		
-
-	// Display main admin menu
-		page_draw(elgg_echo("usersettings:plugins"),elgg_view_layout("one_column",elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins()))));
-?>
\ No newline at end of file
diff --git a/settings/statistics/index.php b/settings/statistics/index.php
index 303838a81..52546956d 100644
--- a/settings/statistics/index.php
+++ b/settings/statistics/index.php
@@ -15,8 +15,7 @@
 
 	// Make sure only valid admin users can see this
 		gatekeeper();
-		
 
 	// Display main admin menu
-		page_draw(elgg_echo("usersettings:statistics"),elgg_view_layout("one_column",elgg_view("usersettings/statistics")));
+		page_draw(elgg_echo("usersettings:statistics"),elgg_view_layout('two_column_left_sidebar','',elgg_view_title(elgg_echo("usersettings:statistics")) . elgg_view("usersettings/statistics")));
 ?>
\ No newline at end of file
diff --git a/settings/user/index.php b/settings/user/index.php
index 99701a83d..b86181308 100644
--- a/settings/user/index.php
+++ b/settings/user/index.php
@@ -20,7 +20,6 @@
 	// Display main admin menu
 		page_draw(

 					elgg_echo("usersettings:user"),

-					elgg_view_layout("one_column",

-					elgg_view("usersettings/form"))

+					elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form"))

 				  );
 ?>
\ No newline at end of file