From f3572aec7f159231ca2b63be1d2c5466a3ff7208 Mon Sep 17 00:00:00 2001
From: csarven <csarven@controlyourself.ca>
Date: Sat, 15 Nov 2008 21:27:35 -0500
Subject: Nudge feature

darcs-hash:20081116022735-eefa4-366f6deb85942f859ebd532e477b57737bcafbf8.gz
---
 actions/emailsettings.php |  5 +++++
 actions/showstream.php    | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 6e189a909..bc79c14f9 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -94,6 +94,9 @@ class EmailsettingsAction extends SettingsAction {
 		common_checkbox('emailnotifymsg',
 		                _('Send me email when someone sends me a private message.'),
 		                $user->emailnotifymsg);
+		common_checkbox('emailnotifynudge',
+		                _('Send me an email when someone nudges me.'),
+		                $user->emailnotifnudge);
 		common_checkbox('emailpost',
 						_('I want to post notices by email.'),
 						$user->emailpost);
@@ -150,6 +153,7 @@ class EmailsettingsAction extends SettingsAction {
 		$emailnotifysub = $this->boolean('emailnotifysub');
 		$emailnotifyfav = $this->boolean('emailnotifyfav');
 		$emailnotifymsg = $this->boolean('emailnotifymsg');
+		$emailnotifynudge = $this->boolean('emailnotifynudge');
 		$emailmicroid = $this->boolean('emailmicroid');
 		$emailpost = $this->boolean('emailpost');
 
@@ -164,6 +168,7 @@ class EmailsettingsAction extends SettingsAction {
 		$user->emailnotifysub = $emailnotifysub;
 		$user->emailnotifyfav = $emailnotifyfav;
 		$user->emailnotifymsg = $emailnotifymsg;
+		$user->emailnotifynudge = $emailnotifynudge;
 		$user->emailmicroid = $emailmicroid;
 		$user->emailpost = $emailpost;
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 9db31c108..56858b477 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -64,7 +64,6 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function show_top($user) {
-
 		$cur = common_current_user();
 
 		if ($cur && $cur->id == $user->id) {
@@ -167,6 +166,10 @@ class ShowstreamAction extends StreamAction {
 									'width' => AVATAR_PROFILE_SIZE,
 									'height' => AVATAR_PROFILE_SIZE,
 									'alt' => $profile->nickname));
+
+        common_element_start('ul', array('id' => 'profile_actions'));
+
+        common_element_start('li', array('id' => 'profile_subscribe'));
 		$cur = common_current_user();
 		if ($cur) {
 			if ($cur->id != $profile->id) {
@@ -179,13 +182,20 @@ class ShowstreamAction extends StreamAction {
 		} else {
 			$this->show_remote_subscribe_link($profile);
 		}
+        common_element_end('li');
 		
 		$user = User::staticGet('id', $profile->id);
 		
 		if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
+            common_element_start('li', array('id' => 'profile_send_a_new_message'));
 			common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
 						   _('Send a message'));
+            common_element_end('li');
+            common_element_start('li', array('id' => 'profile_nudge'));
+            common_nudge_form($user);
+            common_element_end('li');
 		}
+        common_element_end('ul');
 		
 		common_element_end('div');
 
@@ -475,7 +485,8 @@ class ShowstreamAction extends StreamAction {
 			common_raw('&times;');
 			common_element_end('a');
 		}
+		
 		common_element_end('p');
 		common_element_end('li');
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf