21 files changed, 24 insertions, 79 deletions
diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php
new file mode 100644
index 000000000..86afb8ba1
--- /dev/null
+++ b/views/default/core/settings/account.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Account settings form wrapper
+ * 
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$form_body = elgg_view("forms/account/settings");
+$form_body .= '<div class="divider"></div>';
+$form_body .= '<p>';
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
+$form_body .= '</p>';
+
+echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body));
diff --git a/views/default/user/settings/default_access.php b/views/default/core/settings/account/default_access.php
index e7c280198..e7c280198 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/core/settings/account/default_access.php
diff --git a/views/default/user/settings/email.php b/views/default/core/settings/account/email.php
index 396f8e79b..396f8e79b 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/core/settings/account/email.php
diff --git a/views/default/user/settings/language.php b/views/default/core/settings/account/language.php
index ada133791..ada133791 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/core/settings/account/language.php
diff --git a/views/default/user/settings/name.php b/views/default/core/settings/account/name.php
index fad6c488f..fad6c488f 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/core/settings/account/name.php
diff --git a/views/default/usersettings/notifications.php b/views/default/core/settings/account/notifications.php
index afb142ebe..afb142ebe 100644
--- a/views/default/usersettings/notifications.php
+++ b/views/default/core/settings/account/notifications.php
diff --git a/views/default/user/settings/password.php b/views/default/core/settings/account/password.php
index 0bd7f38f8..0bd7f38f8 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/core/settings/account/password.php
diff --git a/views/default/core/settings/statistics.php b/views/default/core/settings/statistics.php
new file mode 100644
index 000000000..1d7a5b052
--- /dev/null
+++ b/views/default/core/settings/statistics.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * User statitsics
+ *
+ * Blank view that can be extended
+ */
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/core/settings/statistics/numentities.php
index 10d2b7c68..10d2b7c68 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/core/settings/statistics/numentities.php
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/core/settings/statistics/online.php
index dc24130cd..dc24130cd 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/core/settings/statistics/online.php
diff --git a/views/default/usersettings/plugins.php b/views/default/core/settings/tools.php
index c4df9e26b..8f5ee4af6 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/core/settings/tools.php
@@ -20,6 +20,6 @@ $count = count($installed_plugins);
 $n = 0;
 foreach ($installed_plugins as $plugin => $data) {
 	if (is_plugin_enabled($plugin)) {
-		echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
+		echo elgg_view("core/settings/tools/plugin", array('plugin' => $plugin, 'details' => $data));
 	}
 }
 \ No newline at end of file
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/core/settings/tools/plugin.php
index 981d8d937..981d8d937 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/core/settings/tools/plugin.php
diff --git a/views/default/forms/account/settings.php b/views/default/forms/account/settings.php
new file mode 100644
index 000000000..b3d9bbc7f
--- /dev/null
+++ b/views/default/forms/account/settings.php
@@ -0,0 +1 @@
+<?php
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 2f4436d6c..134cfec55 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -53,7 +53,7 @@ echo elgg_view('elgg_topbar/extend', $vars);
 
 // user settings
 echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . 'pg/settings/',
+	'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}",
 	'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('settings'),
 	'class' => 'alt',
 ));
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
deleted file mode 100644
index 2e3526aa3..000000000
--- a/views/default/usersettings/form.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-
-$form_body = elgg_view("usersettings/user");
-$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit-button usersettings_save'));
-
-echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body));
-\ No newline at end of file
diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php
deleted file mode 100644
index d1cf85448..000000000
--- a/views/default/usersettings/main.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Elgg user main settings page.
- * Functions for adding and manipulating options on the user settings panel.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// Description of what's going on
-echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description")));
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
deleted file mode 100644
index ab5743d36..000000000
--- a/views/default/usersettings/main_opt/plugins.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg plugin sub-component on the main menu.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-global $CONFIG;
-?>
-<div class="menu_admin_option">
-	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
-	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
-	<a href="<?php echo elgg_get_site_url() . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
-</div>
-\ No newline at end of file
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
deleted file mode 100644
index 0f3872143..000000000
--- a/views/default/usersettings/main_opt/statistics.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg satistics sub-component on the main menu.
- *
- * @package Elgg
- * @subpackage Core
- */
-?>
-<div class="menu_admin_option">
-	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
-	<p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br />
-	<a href="<?php echo elgg_get_site_url() . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
-</div>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
deleted file mode 100644
index d9f2b5677..000000000
--- a/views/default/usersettings/main_opt/user.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg user sub-component on the main menu.
- *
- * @package Elgg
- * @subpackage Core
- */
-?>
-<div class="menu_admin_option">
-	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
-	<p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br />
-	<a href="<?php echo elgg_get_site_url() . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
-</div>
-\ No newline at end of file
diff --git a/views/default/usersettings/statistics.php b/views/default/usersettings/statistics.php
deleted file mode 100644
index c90d14c6d..000000000
--- a/views/default/usersettings/statistics.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Elgg settings specific user settings.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-?>
-\ No newline at end of file
diff --git a/views/default/usersettings/user.php b/views/default/usersettings/user.php
deleted file mode 100644
index c6a56a14e..000000000
--- a/views/default/usersettings/user.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-?>
-\ No newline at end of file