aboutsummaryrefslogtreecommitdiff
path: root/mod/notifications
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-18 17:47:50 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-18 17:47:50 +0000
commit569f19d8ff89539eb8d38b1ca1b07a2baa41852c (patch)
tree0ace0c2792db822cd0db5eae672f1f472a29439a /mod/notifications
parent8ec093ecc1bf28c09f5d2dbe3c7bc8e6a2485ac6 (diff)
downloadelgg-569f19d8ff89539eb8d38b1ca1b07a2baa41852c.tar.gz
elgg-569f19d8ff89539eb8d38b1ca1b07a2baa41852c.tar.bz2
half way through converting submenu to new menu code - pages and groups are the two major users left
git-svn-id: http://code.elgg.org/elgg/trunk@7669 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/notifications')
-rw-r--r--mod/notifications/groups.php13
-rw-r--r--mod/notifications/index.php13
-rw-r--r--mod/notifications/start.php20
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/form.php8
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/groupsform.php1
5 files changed, 33 insertions, 22 deletions
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 10e320032..c4f59c049 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Elgg notifications plugin group index
*
@@ -17,6 +16,8 @@ set_page_owner(get_loggedin_userid());
// Set the context to settings
elgg_set_context('settings');
+$title = elgg_echo('notifications:subscriptions:changesettings:groups');
+
// Get the form
$people = array();
@@ -29,8 +30,10 @@ $body = elgg_view('input/form',array(
'action' => 'action/notificationsettings/groupsave'
));
-// Insert it into the correct canvas layout
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
-
+$params = array(
+ 'content' => $body,
+ 'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
-echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings:groups'), $body);
+echo elgg_view_page($title, $body);
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index c162c34b3..4536b8788 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Elgg notifications plugin index
*
@@ -20,6 +19,8 @@ elgg_register_js($js_url, 'friendsPicker');
// Set the context to settings
elgg_set_context('settings');
+$title = elgg_echo('notifications:subscriptions:changesettings');
+
// Get the form
$people = array();
if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999))) {
@@ -30,8 +31,10 @@ if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => '
$body = elgg_view('notifications/subscriptions/form', array('people' => $people));
-// Insert it into the correct canvas layout
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
-
+$params = array(
+ 'content' => $body,
+ 'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
-echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings'), $body);
+echo elgg_view_page($title, $body);
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 1bb99da35..859f4ac14 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -60,11 +60,23 @@ function notifications_page_handler($page) {
*
*/
function notifications_plugin_pagesetup() {
- global $CONFIG;
- if (elgg_get_context() == 'settings') {
- add_submenu_item(elgg_echo('notifications:subscriptions:changesettings'), "pg/notifications/personal");
+ if (elgg_get_context() == "settings" && get_loggedin_userid()) {
+ $user = get_loggedin_user();
+
+ $params = array(
+ 'name' => '2_a_user_notify',
+ 'title' => elgg_echo('notifications:subscriptions:changesettings'),
+ 'url' => "pg/notifications/personal",
+ );
+ elgg_register_menu_item('page', $params);
+
if (is_plugin_enabled('groups')) {
- add_submenu_item(elgg_echo('notifications:subscriptions:changesettings:groups'), "pg/notifications/group");
+ $params = array(
+ 'name' => '2_group_notify',
+ 'title' => elgg_echo('notifications:subscriptions:changesettings:groups'),
+ 'url' => "pg/notifications/group",
+ );
+ elgg_register_menu_item('page', $params);
}
}
}
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 449f908a7..b7a34f98e 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -1,14 +1,8 @@
<?php
-
/**
- * Elgg SMS Client
- *
- * @package ElggSMS
+ * Elgg personal notifications
*/
-
-// Echo title
- echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings'));
echo elgg_view('subscriptions/form/additions',$vars);
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index bf75f5931..b5328e5ab 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -17,7 +17,6 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
$subsbig[$method] = $tmparray;
}
-echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups'));
?>
<div class="user-settings margin-top">