From b3c486b0ba9a3005e9b4ebf8269df582e84fc72f Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 02:49:24 +0000
Subject: moved default notification settings into usersettings

git-svn-id: http://code.elgg.org/elgg/trunk@7629 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/notification.php                        |  2 +-
 mod/notifications/start.php                        |  2 +-
 .../notifications/settings/usersettings.php        | 51 ----------------------
 views/default/usersettings/notifications.php       | 51 ++++++++++++++++++++++
 4 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 views/default/notifications/settings/usersettings.php
 create mode 100644 views/default/usersettings/notifications.php

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index e75e6b34b..5a96b9623 100644
--- 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('notifications/settings/usersettings', 'usersettings/user');
+	extend_elgg_settings_page('usersettings/notifications', 'usersettings/user');
 
 	elgg_register_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
 }
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index eb9e4778e..15b079bda 100644
--- 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', 'notifications/settings/usersettings');
+	elgg_unextend_view('usersettings/user', 'usersettings/notifications');
 
 	// update notifications based on relationships changing
 	elgg_register_event_handler('delete', 'member', 'notifications_relationship_remove');
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
deleted file mode 100644
index afb142ebe..000000000
--- a/views/default/notifications/settings/usersettings.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * User settings for notifications.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-global $NOTIFICATION_HANDLERS;
-$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
-
-?>
-<div class="user-settings notifications">
-<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
-
-<p><?php echo elgg_echo('notifications:methods'); ?>
-
-<table>
-<?php
-	// Loop through options
-	foreach ($NOTIFICATION_HANDLERS as $k => $v) {
-?>
-		<tr>
-			<td><?php echo elgg_echo($k); ?>: </td>
-
-			<td>
-<?php
-
-	if ($notification_settings->$k) {
-		$val = "yes";
-	} else {
-		$val = "no";
-	}
-	
-	echo elgg_view('input/radio', array(
-		'internalname' => "method[$k]",
-		'value' => $val,
-		'options' => array(
-			elgg_echo('option:yes') => 'yes',
-			elgg_echo('option:no') => 'no'
-		),
-	));
-
-?>
-			</td>
-		</tr>
-<?php
-	}
-?>
-</table>
-</div>
\ No newline at end of file
diff --git a/views/default/usersettings/notifications.php b/views/default/usersettings/notifications.php
new file mode 100644
index 000000000..afb142ebe
--- /dev/null
+++ b/views/default/usersettings/notifications.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * User settings for notifications.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+global $NOTIFICATION_HANDLERS;
+$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
+
+?>
+<div class="user-settings notifications">
+<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
+
+<p><?php echo elgg_echo('notifications:methods'); ?>
+
+<table>
+<?php
+	// Loop through options
+	foreach ($NOTIFICATION_HANDLERS as $k => $v) {
+?>
+		<tr>
+			<td><?php echo elgg_echo($k); ?>: </td>
+
+			<td>
+<?php
+
+	if ($notification_settings->$k) {
+		$val = "yes";
+	} else {
+		$val = "no";
+	}
+	
+	echo elgg_view('input/radio', array(
+		'internalname' => "method[$k]",
+		'value' => $val,
+		'options' => array(
+			elgg_echo('option:yes') => 'yes',
+			elgg_echo('option:no') => 'no'
+		),
+	));
+
+?>
+			</td>
+		</tr>
+<?php
+	}
+?>
+</table>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3