Fixes #3266 let the settings pages have breadcrumbs

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

diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index 5c4d1fbe43a7aa2661acc75b6d8f55427edc80b0..29415f6ba4741571c94e0e0c94f02db539352093 100644 (file)
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -286,11 +286,23 @@ function usersettings_page_handler($page) {
                $page[0] = 'user';
        }
 
+       if ($page[1]) {
+               $user = get_user_by_username($page[1]);
+               elgg_set_page_owner_guid($user->guid);
+       } else {
+               $user = elgg_get_logged_in_user_guid();
+               elgg_set_page_owner_guid($user->guid);
+       }
+
+       elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+
        switch ($page[0]) {
                case 'statistics':
+                       elgg_push_breadcrumb(elgg_echo('usersettings:statistics:opt:linktext'));
                        $path = $CONFIG->path . "pages/settings/statistics.php";
                        break;
                case 'plugins':
+                       elgg_push_breadcrumb(elgg_echo('usersettings:plugins:opt:linktext'));
                        $path = $CONFIG->path . "pages/settings/tools.php";
                        break;
                case 'user':
@@ -299,13 +311,6 @@ function usersettings_page_handler($page) {
                        break;
        }
 
-       if ($page[1]) {
-               $user = get_user_by_username($page[1]);
-               elgg_set_page_owner_guid($user->guid);
-       } else {
-               elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-       }
-
        require($path);
 }
 

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index eb5c3db95e677021243fdd274f24a85259338007..d64c00c8ef4f9a4e4b4434e670ca97b85ab2df59 100644 (file)
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -11,17 +11,26 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
 // Ensure only logged-in users can see this page
 gatekeeper();
 
-set_page_owner(elgg_get_logged_in_user_guid());
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+$user = elgg_get_page_owner_guid();
 
 // Set the context to settings
 elgg_set_context('settings');
 
 $title = elgg_echo('notifications:subscriptions:changesettings:groups');
 
+elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+elgg_push_breadcrumb($title);
+
 // Get the form
 $people = array();
 
-$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 9999));
+$groupmemberships = elgg_get_entities_from_relationship(array(
+       'relationship' => 'member',
+       'relationship_guid' => elgg_get_logged_in_user_guid(),
+       'types' => 'group',
+       'limit' => 9999,
+));
 
 $body = elgg_view_form('notificationsettings/groupsave', array(), array('groups' => $groupmemberships));
 

diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index 49c91fe0e3b32b96fd6fadcf2d22b64c5818fa69..b546776817b45966def14e56333b00a79a121f38 100644 (file)
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -11,7 +11,8 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
 // Ensure only logged-in users can see this page
 gatekeeper();
 
-set_page_owner(elgg_get_logged_in_user_guid());
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+$user = elgg_get_page_owner_guid();
 
 $js_url = elgg_get_simplecache_url('js', 'friendsPickerv1');
 elgg_register_js('friendsPickerv1', $js_url);
@@ -22,6 +23,9 @@ elgg_set_context('settings');
 
 $title = elgg_echo('notifications:subscriptions:changesettings');
 
+elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+elgg_push_breadcrumb($title);
+
 // Get the form
 $people = array();
 if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999))) {

diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index a38fe48d0107c351299c3f5adad9c0530355f60f..2bf0d962876bf2441c87dfb3c2f074ba46eca18b 100644 (file)
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -7,7 +7,12 @@
 
 global $NOTIFICATION_HANDLERS;
 foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
-       $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
+       $subsbig[$method] = elgg_get_entities_from_relationship(array(
+               'relationship' => 'notify' . $method,
+               'relationship_guid' => elgg_get_logged_in_user_guid(),
+               'types' => 'group',
+               'limit' => 99999,
+       ));
        $tmparray = array();
        if ($subsbig[$method]) {
                foreach($subsbig[$method] as $tmpent) {
@@ -91,7 +96,10 @@ END;
                </table>
 <?php
 }
+       echo '<div class="mtm">';
+       echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+       echo '</div>';
+       
 ?>
-               <input type="submit" value="<?php echo elgg_echo('save'); ?>" />
        </div>
 </div>

diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index b6b322a1b1daf4747eee20ee48a5fb9dc14e1ede..d286d37a39213c322ee32b018c2f53598d662925 100644 (file)
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) {
 
 ?>
 
-       <p class="elgg-divide-top">
+       <div class="elgg-divide-top mtm ptm">
 <?php
 echo elgg_view('input/submit', array(
        'value' => elgg_echo('save'),