reorganized the settings views and updated the pages to use new layout

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

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 5a96b96239f858ef72ea30b44156620848830345..5b53a4a1092097cf3ff58d02917adba845017a64 100644 (file)
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -360,7 +360,7 @@ function notification_init() {
        register_notification_handler("email", "email_notify_handler");
 
        // Add settings view to user settings & register action
-       extend_elgg_settings_page('usersettings/notifications', 'usersettings/user');
+       elgg_extend_view('forms/account/settings', 'core/settings/account/notifications');
 
        elgg_register_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
 }

diff --git a/engine/lib/statistics.php b/engine/lib/statistics.php
index 0855843177c10aa7cace333745723a92e06260b5..578985fd040dd0d514915ebdcd7db825ac1bd599 100644 (file)
--- a/engine/lib/statistics.php
+++ b/engine/lib/statistics.php
@@ -110,8 +110,8 @@ function get_online_users() {
  * @return void
  */
 function statistics_init() {
-       extend_elgg_settings_page('usersettings/statistics_opt/online', 'usersettings/statistics');
-       extend_elgg_settings_page('usersettings/statistics_opt/numentities', 'usersettings/statistics');
+       elgg_extend_view('core/settings/statistics', 'core/settings/statistics/online');
+       elgg_extend_view('core/settings/statistics', 'core/settings/statistics/numentities');
 }
 
 /// Register init function

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 076f7b9f7e1d482666c3dc5c1f6c7cdbf3deff98..4e34586a3ec89eb863465f3cb5d5b8f98e91f8cd 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1544,25 +1544,12 @@ function users_init() {
 
        elgg_register_widget_type('friends', elgg_echo("friends"), elgg_echo('friends:widget:description'));
 
-       // User name change
-       extend_elgg_settings_page('user/settings/name', 'usersettings/user', 1);
-       //elgg_register_action("user/name");
-
-       // User password change
-       extend_elgg_settings_page('user/settings/password', 'usersettings/user', 1);
-       //elgg_register_action("user/password");
-
-       // Add email settings
-       extend_elgg_settings_page('user/settings/email', 'usersettings/user', 1);
-       //elgg_register_action("email/save");
-
-       // Add language settings
-       extend_elgg_settings_page('user/settings/language', 'usersettings/user', 1);
-
-       // Add default access settings
-       extend_elgg_settings_page('user/settings/default_access', 'usersettings/user', 1);
-
-       //elgg_register_action("user/language");
+       // extend the account settings form
+       elgg_extend_view('forms/account/settings', 'core/settings/account/name', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/password', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/email', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/language', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/default_access', 100);
 
        // Register the user type
        register_entity_type('user', '');

diff --git a/engine/lib/usersettings.php b/engine/lib/usersettings.php
index 1696dd1cd05bbbd0e0911db655330fdc5f7b070b..7192ea0fa9146dad226719370056eeb1f9609c22 100644 (file)
--- a/engine/lib/usersettings.php
+++ b/engine/lib/usersettings.php
@@ -26,9 +26,12 @@
  * @param int    $priority          Optional priority to govern the appearance in the list.
  *
  * @return bool
+ * @deprecated 1.8 Extend oone of the views in core/settings
  */
 function extend_elgg_settings_page($new_settings_view, $view = 'usersettings/main',
 $priority = 500) {
+       // see views: /core/settings
+       elgg_deprecated_notice("extend_elgg_settings_page has been deprecated. Extend on of the settings views instead", 1.8);
 
        return elgg_extend_view($view, $new_settings_view, $priority);
 }
@@ -66,24 +69,28 @@ function usersettings_pagesetup() {
 function usersettings_page_handler($page) {
        global $CONFIG;
 
-       $path = $CONFIG->path . "pages/settings/index.php";
+       if (!isset($page[0])) {
+               $page[0] = 'user';
+       }
 
-       if ($page[0]) {
-               switch ($page[0]) {
-                       case 'user':
-                               $path = $CONFIG->path . "pages/settings/user.php";
-                               break;
-                       case 'statistics':
-                               $path = $CONFIG->path . "pages/settings/statistics.php";
-                               break;
-                       case 'plugins':
-                               $path = $CONFIG->path . "pages/settings/plugins.php";
-                               break;
-               }
+       switch ($page[0]) {
+               case 'statistics':
+                       $path = $CONFIG->path . "pages/settings/statistics.php";
+                       break;
+               case 'plugins':
+                       $path = $CONFIG->path . "pages/settings/tools.php";
+                       break;
+               case 'user':
+               default:
+                       $path = $CONFIG->path . "pages/settings/account.php";
+                       break;
        }
 
        if ($page[1]) {
-               set_input('username', $page[1]);
+               $user = get_user_by_username($page[1]);
+               elgg_set_page_owner_guid($user->guid);
+       } else {
+               elgg_set_page_owner_guid(get_loggedin_userid());
        }
 
        require($path);

diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 15b079bda7a53b08f41d9716b1124264d3a523a0..57099dc4c77be230bb3ddfb9d22a79668e47ed9c 100644 (file)
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -18,7 +18,7 @@ function notifications_plugin_init() {
 
        // Unset the default notification settings
        elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user-settings_save');
-       elgg_unextend_view('usersettings/user', 'usersettings/notifications');
+       elgg_unextend_view('core/settings/account', 'core/settings/account/notifications');
 
        // update notifications based on relationships changing
        elgg_register_event_handler('delete', 'member', 'notifications_relationship_remove');

diff --git a/pages/settings/account.php b/pages/settings/account.php
new file mode 100644 (file)
index 0000000..88e9166
--- /dev/null
+++ b/pages/settings/account.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg user account settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// Only logged in users
+gatekeeper();
+
+// Make sure we don't open a security hole ...
+if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
+       set_page_owner(get_loggedin_userid());
+}
+
+$title = elgg_echo('usersettings:user');
+
+$content .= elgg_view('core/settings/account');
+
+$params = array(
+       'content' => $content,
+       'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
+
+echo elgg_view_page($title, $body);

diff --git a/pages/settings/index.php b/pages/settings/index.php
deleted file mode 100644 (file)
index dbc8c87..0000000
--- a/pages/settings/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Elgg user settings system index
- *
- * @package Elgg
- * @subpackage Core
- */
-
-if (!elgg_get_page_owner_guid()) {
-       set_page_owner(get_loggedin_userid());
-}
-
-// Make sure we don't open a security hole ...
-if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
-       set_page_owner(get_loggedin_userid());
-}
-
-// Forward to the user settings
-forward('pg/settings/user/' . elgg_get_page_owner()->username . "/");
\ No newline at end of file

diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 741003308849c3ea6ea95bb3f91df83005125109..165c31e8e4acdd4ea45cdb8b9c9ee58d060f6c65 100644 (file)
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-// Make sure only valid admin users can see this
+// Only logged in users
 gatekeeper();
 
 // Make sure we don't open a security hole ...
@@ -14,9 +14,14 @@ if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
-$content = elgg_view_title(elgg_echo("usersettings:statistics"));
-$content .= elgg_view("usersettings/statistics");
+$title = elgg_echo("usersettings:statistics");
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$content = elgg_view("core/settings/statistics");
 
-echo elgg_view_page(elgg_echo("usersettings:statistics"), $body);
+$params = array(
+       'content' => $content,
+       'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', array('content' => $content));
+
+echo elgg_view_page($title, $body);

diff --git a/pages/settings/plugins.php b/pages/settings/tools.php
similarity index 53%
rename from pages/settings/plugins.php
rename to pages/settings/tools.php
index 657519d3806e12d10d3b0f3b0fe0796772618ed3..e1c24758176824f299d3c297c7e9b2530e1660a5 100644 (file)
--- a/pages/settings/plugins.php
+++ b/pages/settings/tools.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg user plugin settings.
+ * Elgg user tools settings
  *
  * @package Elgg
  * @subpackage Core
@@ -14,10 +14,15 @@ if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
-$content = elgg_view_title(elgg_echo("usersettings:plugins"));
-$content .= elgg_view("usersettings/plugins",
+$title = elgg_echo("usersettings:plugins");
+
+$content = elgg_view("core/settings/tools",
        array('installed_plugins' => get_installed_plugins()));
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$params = array(
+       'content' => $content,
+       'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
-echo elgg_view_page(elgg_echo("usersettings:plugins"), $body);
+echo elgg_view_page($title, $body);

diff --git a/pages/settings/user.php b/pages/settings/user.php
deleted file mode 100644 (file)
index 2a53054..0000000
--- a/pages/settings/user.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg user account settings.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// Make sure only valid admin users can see this
-gatekeeper();
-
-// Make sure we don't open a security hole ...
-if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
-       set_page_owner(get_loggedin_userid());
-}
-
-$content = elgg_view_title(elgg_echo('usersettings:user'));
-$content .= elgg_view("usersettings/form");
-
-$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
-
-echo elgg_view_page(elgg_echo("usersettings:user"), $body);

diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php
new file mode 100644 (file)
index 0000000..86afb8b
--- /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
similarity index 100%
rename from views/default/user/settings/default_access.php
rename to 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
similarity index 100%
rename from views/default/user/settings/email.php
rename to views/default/core/settings/account/email.php

diff --git a/views/default/user/settings/language.php b/views/default/core/settings/account/language.php
similarity index 100%
rename from views/default/user/settings/language.php
rename to views/default/core/settings/account/language.php

diff --git a/views/default/user/settings/name.php b/views/default/core/settings/account/name.php
similarity index 100%
rename from views/default/user/settings/name.php
rename to views/default/core/settings/account/name.php

diff --git a/views/default/usersettings/notifications.php b/views/default/core/settings/account/notifications.php
similarity index 100%
rename from views/default/usersettings/notifications.php
rename to views/default/core/settings/account/notifications.php

diff --git a/views/default/user/settings/password.php b/views/default/core/settings/account/password.php
similarity index 100%
rename from views/default/user/settings/password.php
rename to 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 (file)
index 0000000..1d7a5b0
--- /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
similarity index 100%
rename from views/default/usersettings/statistics_opt/numentities.php
rename to 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
similarity index 100%
rename from views/default/usersettings/statistics_opt/online.php
rename to views/default/core/settings/statistics/online.php

diff --git a/views/default/usersettings/plugins.php b/views/default/core/settings/tools.php
similarity index 85%
rename from views/default/usersettings/plugins.php
rename to views/default/core/settings/tools.php
index c4df9e26b4922fe3f426f3cfc6b1bce1a652e575..8f5ee4af6b52624da4c281dcc5ee7ec03e04dd13 100644 (file)
--- 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
similarity index 100%
rename from views/default/usersettings/plugins_opt/plugin.php
rename to 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 (file)
index 0000000..b3d9bbc
--- /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 2f4436d6c72ad2ce5f85a10a727cbdcf984594ac..134cfec5506f4258abc2506a3f0b2781714cb67f 100644 (file)
--- 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 (file)
index 2e3526a..0000000
--- 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 (file)
index d1cf854..0000000
--- 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 (file)
index ab5743d..0000000
--- 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 (file)
index 0f38721..0000000
--- 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 (file)
index d9f2b56..0000000
--- 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 (file)
index c90d14c..0000000
--- 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 (file)
index c6a56a1..0000000
--- a/views/default/usersettings/user.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-?>
\ No newline at end of file