From 5356a17ae82982ebe96e91ea309ab89713cf888d Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 5 Feb 2009 17:47:07 +0000
Subject: Further notification settings changes.

git-svn-id: https://code.elgg.org/elgg/trunk@2658 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/notifications/css.php            |  4 ++
 .../notifications/settings/usersettings.php        |  3 ++
 .../notifications/subscriptions/collections.php    |  3 ++
 .../default/notifications/subscriptions/form.php   |  7 ++-
 .../notifications/subscriptions/forminternals.php  |  3 ++
 .../notifications/subscriptions/personal.php       | 63 ++++++++++++++++++++++
 6 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 mod/notifications/views/default/notifications/settings/usersettings.php
 create mode 100644 mod/notifications/views/default/notifications/subscriptions/collections.php
 create mode 100644 mod/notifications/views/default/notifications/subscriptions/personal.php

(limited to 'mod/notifications/views/default')

diff --git a/mod/notifications/views/default/notifications/css.php b/mod/notifications/views/default/notifications/css.php
index 1c20a7b96..db766a2c9 100644
--- a/mod/notifications/views/default/notifications/css.php
+++ b/mod/notifications/views/default/notifications/css.php
@@ -38,4 +38,8 @@
 }
 #notificationstable td.emailtogglefield a.emailtoggleOn {
 	background: url(<?php echo $vars['url']; ?>mod/notifications/graphics/icon_notifications_email.gif) no-repeat right -36px;
+}
+
+.notification_personal {
+	margin-bottom: 25px;
 }
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/settings/usersettings.php b/mod/notifications/views/default/notifications/settings/usersettings.php
new file mode 100644
index 000000000..0165eb215
--- /dev/null
+++ b/mod/notifications/views/default/notifications/settings/usersettings.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
new file mode 100644
index 000000000..0165eb215
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 08e539e17..a81f4290b 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -19,13 +19,12 @@
 	// Display a description
 ?>
 <div class="notification_methods">
-	<p class="notification_methods_intro">
-		<?php echo elgg_echo('notifications:subscriptions:description'); ?>
-	</p>
 <?php
 
 	echo elgg_view('input/form',array(
-			'body' => elgg_view('notifications/subscriptions/forminternals'),
+			'body' => 	elgg_view('notifications/subscriptions/personal') .
+						elgg_view('notifications/subscriptions/collections') .
+						elgg_view('notifications/subscriptions/forminternals'),
 			'method' => 'post',
 			'action' => $vars['url'] . 'action/notificationsettings/save',
 		));
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 122a00fb5..e73dc5f3e 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -1,3 +1,6 @@
+	<p class="notification_methods_intro">
+		<?php echo elgg_echo('notifications:subscriptions:description'); ?>
+	</p>
 <?php
 
 	// Get friends and subscriptions
diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php
new file mode 100644
index 000000000..6c8069bd3
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/personal.php
@@ -0,0 +1,63 @@
+<?php
+
+	global $NOTIFICATION_HANDLERS;
+
+?>
+<div class="notification_personal">
+<div class="notification_methods">
+	<p class="notification_methods_intro">
+		<?php echo elgg_echo('notifications:subscriptions:personal:title'); ?>
+	</p>
+</div>
+<table id="notificationstable" cellspacing="0" cellpadding="4" border="1" width="100%">
+  <tr>
+    <td>&nbsp;</td>
+<?php
+	$i = 0; 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0)
+			echo "<td class=\"spacercolumn\">&nbsp;</td>";
+?>
+	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td class="namefield">
+    	<p>
+    		<?php echo elgg_echo('notifications:subscriptions:personal:description') ?>
+    	</p>
+    	
+    </td>
+    
+<?php
+
+		$fields = '';
+		$i = 0;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			if ($notification_settings = get_user_notification_settings($vars['user']->guid)) {
+				if ($notification_settings->$method) {
+					$personalchecked[$method] = 'checked="checked"';
+				} else {
+					$personalchecked[$method] = '';
+				}
+			}
+			if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+			$fields .= <<< END
+			    <td class="{$method}togglefield">
+			    <a href="#" border="0" id="{$method}personal" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}personal');">
+			    <input type="checkbox" name="{$method}personal" id="{$method}checkbox" onclick="adjust{$method}('{$method}personal');" value="1" {$personalchecked[$method]} /></a></td>
+END;
+			$i++;
+		}
+		echo $fields;
+
+?>
+  
+    <td>&nbsp;</td>
+  </tr>
+</table>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3