the beginnings of a new activity river with ajax notification and conversation clustering.

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

13 files changed, 604 insertions, 258 deletions

diff --git a/mod/riverdashboard/views/default/river/dashboard.php b/mod/riverdashboard/views/default/river/dashboard.php
new file mode 100644
index 000000000..5fe7c35d3
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/dashboard.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Elgg river for dashboard.
+ */
+
+/// Extract the river
+$river = $vars['river'];
+?>
+<div id="river">
+<?php
+if (($river) && (count($river)>0)) {
+	foreach ($river as $r) {
+		echo $r;
+	}
+} else {
+	echo elgg_echo('river:widget:noactivity');
+}
+?>
+</div><!-- /river -->
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
new file mode 100644
index 000000000..25774ff08
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ */
+?>
+<div class="river_item_list">
+<?php
+	if (isset($vars['items']) && is_array($vars['items'])) {
+
+		$i = 0;
+		if (!empty($vars['items'])) {
+			foreach($vars['items'] as $item) {
+				echo elgg_view_river_item($item);
+				$i++;
+				if ($i >= $vars['limit']) {
+					break;
+				}
+			}
+		}
+	}
+
+	if ($vars['pagination'] !== false) {
+		$baseurl = $_SERVER['REQUEST_URI'];
+		$baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
+
+		$nav = '';
+
+		if (sizeof($vars['items']) > $vars['limit']) {
+			$newoffset = $vars['offset'] + $vars['limit'];
+			$urladdition = 'offset='.$newoffset;
+			if (substr_count($baseurl,'?')) {
+				$nexturl = $baseurl . '&' . $urladdition;
+			} else {
+				$nexturl=$baseurl . '?' . $urladdition;
+			}
+
+			$nav .= '<a class="back" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+		}
+
+		if ($vars['offset'] > 0) {
+			$newoffset = $vars['offset'] - $vars['limit'];
+			if ($newoffset < 0) {
+				$newoffset = 0;
+			}
+			$urladdition = 'offset='.$newoffset;
+			if (substr_count($baseurl,'?')) {
+				$prevurl=$baseurl . '&' . $urladdition;
+			} else {
+				$prevurl=$baseurl . '?' . $urladdition;
+			}
+
+			$nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+		}
+
+		if (!empty($nav)) {
+			echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';
+		}
+	}
+?>
+</div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
new file mode 100644
index 000000000..1aa508d99
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Elgg river item wrapper.
+ * Wraps all river items.
+ */
+
+//set required variables
+$object = get_entity($vars['item']->object_guid);
+//get object url
+$object_url = $object->getURL();
+//user
+//if displaying on the profile get the object owner, else the subject_guid
+if(get_context() == 'profile' && $object->getSubtype() ==  'thewire')
+	$user = get_entity($object->owner_guid);
+else
+	$user = get_entity($vars['item']->subject_guid);
+
+//get the right annotation type
+//*todo - use the same for comments, everywhere e.g. comment
+switch($vars['item']->subtype){
+	case 'thewire':
+	$annotation_comment = 'wire_reply';
+	break;
+	default:
+	$annotation_comment = 'generic_comment';
+	break;
+}
+
+//count comment annotations
+$comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment);
+
+//count like annotations
+$likes = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, "likes");
+
+//get last two comments display
+$get_comments = get_annotations($vars['item']->object_guid, "", "", $annotation_comment, "", "", 3, 0, "desc");
+
+if($get_comments){
+	//reverse the array so we can display comments in the right order
+	$get_comments = array_reverse($get_comments);	
+}
+
+//minus two off the comment total as we display two by default
+if($comment_count < 3)
+	$num_comments = 0;
+else
+	$num_comments = $comment_count - 3;
+?>
+<div class="river_item">
+	<!-- avatar -->
+	<span class="river_item_useravatar" style="float:left;margin:0 10px 10px 0;">
+		<?php
+			echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small'));
+		?>
+	</span>
+	<!-- body contents, generated by the river view in each plugin -->
+	<?php
+		echo $vars['body'];
+	?>
+	<div class="clearfloat"></div>
+	<!-- display comments and likes if on  the dashboard/live feed -->
+	<div class="river_item_annotation">
+		<?php
+			//display the number of comments and likes if there are any
+			if($num_comments != 0){
+				echo "<div class='river_more_comments'><span class='more_comments'>";
+				//set the correct context comment or comments
+				if($num_comments == 1)
+					echo "<a href=\"{$object_url}\">+{$num_comments} more comment</a>";
+				else
+					echo "<a href=\"{$object_url}\">+{$num_comments} more comments</a>";
+					
+				echo "</span></div>";	
+			}
+			//display latest 2 comments if there are any
+			if($get_comments){
+				$counter = 0;
+				$background = "";
+				echo "<div class='river_comments'>";
+				foreach($get_comments as $gc){
+					//get the comment owner
+					$comment_owner = get_user($gc->owner_guid);
+					//get the comment owner's profile url
+					$comment_owner_url = $comment_owner->getURL();
+					// color-code each of the 3 comments
+					if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) )
+						$alt = 'latest';
+					else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) )
+						$alt = 'penultimate';
+					
+					//display comment
+					echo "<div class='river_comment {$alt}'>";
+					echo "<div class='river_comment_owner_icon'>";
+					echo elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny'));
+					echo "</div>";
+					//truncate comment to 150 characters
+					if(strlen($gc->value) > 150) {
+				        	$gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "...";
+				    }
+					$contents = strip_tags($gc->value);
+				    echo "<div class='comment_wrapper'>";
+					echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents);
+					echo "<br /><span class='river_item_time'>" . friendly_time($gc->time_created) . "</span>";
+					echo "<div class=\"clearfloat\"></div>";
+					echo "</div></div>";
+					$counter++;
+				}
+				echo "</div>";
+			}
+			//display the comment link
+			if($vars['item']->type != 'user'){
+				//for now don't display the comment link on bookmarks and wire messages
+				if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '')
+					echo "<span class='comment_link'><a href=\"{$object_url}\">Comment</a></span>";
+			}
+		?>
+	</div>
+	<div class="clearfloat"></div>
+</div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/relationship/friend/create.php b/mod/riverdashboard/views/default/river/relationship/friend/create.php
new file mode 100644
index 000000000..916efd407
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/relationship/friend/create.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Elgg relationship create event.
+ * Display something in the river when a relationship is created.
+ */
+
+$statement = $vars['statement'];
+
+$performed_by = $statement->getSubject();
+$event = $statement->getEvent();
+$object = $statement->getObject();
+
+if (is_array($object)) {
+	switch ($object['relationship']) {
+		// Friending
+		case 'friend' :
+		case 'friends' : // 'friends' shouldn't be used, but just incase :)
+
+			// Get second object
+			$userb = $object['object'];
+
+			// Only users can be friends
+			if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser)) {
+				// User A
+				echo "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
+
+				// Verb
+				echo elgg_echo('river:relationship:friend');
+
+				// user B
+				echo " <a href=\"{$userb->getURL()}\">{$userb->name}</a>";
+			}
+
+		break;
+	}
+}
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/sitemessage/create.php b/mod/riverdashboard/views/default/river/sitemessage/create.php
deleted file mode 100644
index eaceb1a2e..000000000
--- a/mod/riverdashboard/views/default/river/sitemessage/create.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("sitemessages:river:created"),$url) . " ";
-	$string .= elgg_echo("sitemessages:river:create");
-	$string .= "<div class=\"river_content_display\">";
-	$string .= $object->description;
-	$string .= "</div>";
-
-?>
-
-<?php 
-	echo $string; 
-?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
index f4bfd7f83..a72de9fc4 100644
--- a/mod/riverdashboard/views/default/riverdashboard/container.php
+++ b/mod/riverdashboard/views/default/riverdashboard/container.php
@@ -1,5 +1,52 @@
-<?php
-
-?>
-
-<div id="river_container"><?php echo $vars['body']; ?></div>
\ No newline at end of file
+<div id="river_container"><?php echo $vars['body']; ?></div><!-- /river_container -->

+

+<script type="text/JavaScript">

+$(document).ready(function(){

+	var updates = new thewireUpdateChecker(10000);

+	updates.start();

+});

+

+// check for updates on the wire.

+function thewireUpdateChecker(interval) {

+	this.intervalID = null;

+	this.interval = interval;

+	this.url = '<?php echo $vars['url']; ?>mod/riverdashboard/endpoint/ping.php';

+	this.seconds_passed = 0;

+	

+	this.start = function() {

+		// needed to complete closure scope.

+		var self = this;

+		

+		this.intervalID = setInterval(function() { self.checkUpdates(); }, this.interval);

+	}

+

+	this.checkUpdates = function() {

+		this.seconds_passed += this.interval / 1000;

+		// more closure fun

+		var self = this;

+		$.ajax({

+			'type': 'GET',

+			'url': this.url,

+			'data': {'seconds_passed': this.seconds_passed},

+			'success': function(data) {

+				if (data) {

+					$('#the-wire-updates-notice').html(data).slideDown();

+					// could crank down the interval here.

+					// if we change the message to simply "New Posts!" 

+					// we could stop the polling altogether.

+				}

+			}

+		})

+	}

+

+	this.stop = function() {

+		clearInterval(this.interval);

+	}

+

+	this.changeInterval = function(interval) {

+		this.stop();

+		this.interval = interval;

+		this.start();

+	}

+}

+</script>

diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index d9c36f048..d558b215a 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -3,77 +3,13 @@
 	/**
 	 * Elgg riverdashboard CSS
 	 * 
-	 * @package riverdashboard
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
 	 */
 
 ?>
-.sidebarBox #thewire_sidebarInputBox {
-	width:178px;
-}
-.sidebarBox .last_wirepost {
-	margin:20px 0 20px 0;
-}
-.sidebarBox .last_wirepost .thewire-singlepage {
-	margin:0;
-}
-.sidebarBox .last_wirepost .thewire-singlepage .thewire_options {
-	display:none;
-}
-.sidebarBox .last_wirepost .thewire-singlepage .note_date {
-	line-height: 1em;
-	padding:3px 0 0 0;
-	width:142px;
-}
-.sidebarBox .last_wirepost .thewire-singlepage .note_body {
-	color:#666666;
-	line-height: 1.2em;
-}
-.sidebarBox .last_wirepost .thewire-singlepage .thewire-post {
-	background-position: 130px bottom;
-}
-.sidebarBox .thewire_characters_remaining {
-	float:right;
-}
-.sidebarBox input.thewire_characters_remaining_field {
-	background: #dedede;
-}
-.sidebarBox input.thewire_characters_remaining_field:focus {
-	background: #dedede;
-	border:none;
-}
-.sidebarBox input#thewire_submit_button {
-	margin:2px 0 0 0;
-	padding:2px 2px 1px 2px;
-	height:auto;
-}
-.sidebarBox .membersWrapper {
-	background: white;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	padding:7px;	
-}
-.sidebarBox .membersWrapper .recentMember {
-	margin:2px;
-	float:left;
-}
-.sidebarBox .membersWrapper .recentMember .usericon img {
-	width:25px;
-	height:25px;
-}
-/* br necessary for ie6 & 7 */
-.sidebarBox .membersWrapper br {
-	height:0;
-	line-height:0;
-}
-.welcomemessage {
-	background:white;
-}
+
 .riverdashboard_filtermenu {
 	margin:10px 0 10px 0;
+	float:right;
 }
 
 .river_pagination .forward,
@@ -107,26 +43,31 @@
 *:first-child+html .river_pagination { margin-top:17px; }
 
 /* activity widget */
-.collapsable_box_content .river_item p {
-	color:#333333;
-}
-
 .collapsable_box_content .content_area_user_title h2 {
-	font-size:1.25em;
-	line-height:1.2em;
-	margin:0;
-	padding:0 0 2px 0;
-	color:#4690d6;
+	font-size:1.0em;
 }
+.collapsable_box_content .ContentWrapper.ActivityWidget {
+	
+}
+
 .river_content img {
 	margin:2px 0 2px 20px;
 }
 
+.river_content_title {
+	margin-left:55px;
+	
+}
+.river_content_title a {
+	font-weight: bold;
+	/* color:#333333; */
+}
+
 .river_content_display {
-	border-left:1px solid #ddd;
-	padding:2px 10px 0 10px;
+	border-left:1px solid #DDDDDD;
 	font-size:90%;
-	margin:4px 0 2px 30px;
+	margin:8px 0 6px 55px;
+	padding-left:5px;
 }
 
 .river_content_display p {
@@ -136,13 +77,219 @@
 
 .following_icon {
 	width:20px;
-	height:40px;
+	height:25px;
 	margin:0 2px 0 2px;
-	background: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/follow_icon.png) no-repeat left top;
+	background: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/follow_icon.png) no-repeat left -7px;
 }
 .river_content_display div.usericon a.icon img {
-	width:40px;
-	height:40px;
+	width:25px;
+	height:25px;
+}
+
+
+/* ***************************************
+	ACTIVITY RIVER
+*************************************** */
+.river_item_list {
+	border-top:1px solid #cccccc;
+}
+.river_item p {
+	margin:0;
+}
+.river_item {
+	border-bottom:1px solid #cccccc;
+	padding:7px 0 10px 0;
+/*
+	margin-top:5px;
+	margin-bottom:5px;
+*/
 }
+.river_item_annotation {
+
+}
+span.more_comments {
+
+}
+.river_more_comments {
+	display:block;
+	float:right;
+	padding:2px 4px 7px 30px;
+	text-align:right;
+	width:auto;
+}
+.river_comments {
+	margin:5px 0 0 55px;
+	width:auto;
+}
+.comment_wrapper {
+	margin-left:34px;
+}
+.comment_link {
+	margin-left:55px;
+}
+
+.river_comment_owner_icon {
+	float:left;
+	margin:0 8px 4px 2px;
+}
+
+.river_comment {
+	background-color: #f8f8f8;
+	padding:3px;
+	margin-bottom:3px;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;	
+}
+.river_comment.penultimate {
+	background-color: #eeeeee;
+}
+.river_comment.latest {
+	background-color: #dedede;
+	margin-bottom:0;
+}
+
+.river_item_time {
+	font-size:90%;
+	color:#666666;
+}
+.river_item .river_item_useravatar {
+	float:left;
+	margin:3px 0 0 1px;
+}
+/* IE6 fix */
+* html .river_item p { 
+	/* padding:3px 0 3px 20px; */
+}
+/* IE7 */
+*:first-child+html .river_item p {
+	/* min-height:17px; */
+}
+
+/* .river_object_blog_update, */
+
+.river_object_blog_create,
+.river_object_page_create,
+.river_object_page_update {
+	float:left;
+	width:26px;
+	height:32px;
+	border:none;
+	background-color: transparent;
+	margin-right:6px;
+	margin-top:2px;
+}
+.river_object_blog_create {
+	background-image: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/icon_activity_blogs.png);
+	background-position: left top;
+	background-repeat: no-repeat;
+}
+.river_object_page_create,
+.river_object_page_update {
+	background-image: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/icon_activity_pages.png);
+	background-position: left top;
+	background-repeat: no-repeat;
+}
+
+
+.collapsable_box_content .river_user_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_user_profileupdate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_user_profileiconupdate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_annotate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_bookmarks_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_bookmarks_comment {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_status_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_file_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_file_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_file_comment {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_widget_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_forums_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_forums_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_widget_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;	
+}
+.collapsable_box_content .river_object_blog_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_blog_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_blog_comment {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_forumtopic_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_user_friend {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_relationship_friend_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_relationship_member_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_thewire_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_group_join {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_groupforumtopic_annotate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_groupforumtopic_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_sitemessage_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;	
+}
+.collapsable_box_content .river_user_messageboard {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;	
+}
+.collapsable_box_content .river_object_page_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_page_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_page_top_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_page_top_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_page_top_comment {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.collapsable_box_content .river_object_page_comment {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+
 
 
diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php
new file mode 100644
index 000000000..44084cec9
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/menu.php
@@ -0,0 +1,28 @@
+<?php

+/**

+ * Elgg activity stream menu

+ */

+$allselect = ''; $friendsselect = ''; $mineselect = ''; $display_option = '';

+switch($vars['orient']) {

+	case 'all':		$allselect = 'class="selected"';

+					break;

+	case 'friends':	$friendsselect = 'class="selected"';

+					$display_option = '&amp;display=friends';

+					break;

+	case 'mine':	$mineselect = 'class="selected"';

+					$display_option = '&amp;display=mine';

+					break;

+}

+?>

+<div id="Submenu"><ul>

+<?php

+	if(isloggedin()){

+?>

+		<li <?php echo $allselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/"><?php echo elgg_echo('all'); ?></a></li>

+		<li <?php echo $friendsselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/?display=friends"><?php echo elgg_echo('friends'); ?></a></li>

+		<li <?php echo $mineselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/?display=mine"><?php echo elgg_echo('mine'); ?></a></li>

+

+<?php

+	}

+?>

+</ul></div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 43d5723ca..db868db51 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -1,54 +1,53 @@
-<?php
-
-	$contents = array();
-	$contents['all'] = 'all';
-	if (!empty($vars['config']->registered_entities)) {
-		foreach ($vars['config']->registered_entities as $type => $ar) {
-			foreach ($vars['config']->registered_entities[$type] as $object) {
-				if (!empty($object )) {
-					$keyname = 'item:'.$type.':'.$object;
-				} else $keyname = 'item:'.$type; 
-				$contents[$keyname] = "{$type},{$object}";
-			}
-		}
-	}
-	
-	$allselect = ''; $friendsselect = ''; $mineselect = '';
-	switch($vars['orient']) {
-		case '':		$allselect = 'class="selected"';
-						break;
-		case 'friends':		$friendsselect = 'class="selected"';
-						break;
-		case 'mine':		$mineselect = 'class="selected"';
-						break;
-	}
-
-?>
-
-<div class="contentWrapper">
-	<div id="elgg_horizontal_tabbed_nav">
-		<ul>
-			<li <?php echo $allselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display="><?php echo elgg_echo('all'); ?></a></li>
-			<li <?php echo $friendsselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?display=friends&amp;content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display=friends"><?php echo elgg_echo('friends'); ?></a></li>
-			<li <?php echo $mineselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?display=mine&amp;content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display=mine"><?php echo elgg_echo('mine'); ?></a></li>
-		</ul>
-	</div>
-	
-	<div class="riverdashboard_filtermenu">
-		<select name="content" id="content" onchange="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?callback=true&amp;display='+$('input#display').val() + '&amp;content=' + $('select#content').val());">
-			<?php
-	
-				foreach($contents as $label => $content) {
-					if (("{$vars['type']},{$vars['subtype']}" == $content) ||
-						(empty($vars['subtype']) && $content == 'all')) {
-						$selected = 'selected="selected"';
-					} else $selected = '';
-					echo "<option value=\"{$content}\" {$selected}>".elgg_echo($label)."</option>";
-				}
-			
-			?>
-		</select>
-		<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
-		<!-- <input type="submit" value="<?php echo elgg_echo('filter'); ?>" /> -->
-	</div>
-<!-- </div> -->
+<?php

+

+$contents = array();

+$contents['all'] = 'all';

+if (!empty($vars['config']->registered_entities)) {

+	foreach ($vars['config']->registered_entities as $type => $ar) {

+		foreach ($vars['config']->registered_entities[$type] as $object) {

+			if($object != 'helppage'){

+				if (!empty($object )) {

+					$keyname = 'item:'.$type.':'.$object;

+				} else $keyname = 'item:'.$type; 

+				$contents[$keyname] = "{$type},{$object}";

+			}

+		}

+	}

+}

+	

+$allselect = ''; $friendsselect = ''; $mineselect = ''; $display_option = '';

+switch($vars['orient']) {

+	case '':		$allselect = 'class="selected"';

+					break;

+	case 'friends':	$friendsselect = 'class="selected"';

+					$display_option = '&amp;display=friends';

+					break;

+	case 'mine':	$mineselect = 'class="selected"';

+					$display_option = '&amp;display=mine';

+					break;

+}

+?>

+<div class="ContentWrapper">

+	<div class="riverdashboard_filtermenu"> 

+		<?php

+			$location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";

+			$current = get_input('subtype');

+			foreach($contents as $label => $content) {

+				$get_values = explode(",", $content);

+				//select the current filter

+				if($get_values[1] == $current)

+					$selected = "SELECTED";

+				//set the drop down filter

+				if($content[0] && $content[1])

+					$location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}mod/riverdashboard/index.php?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo($label) . "</option>";				

+				//reset selected

+				$selected = '';

+			}

+			$location_filter .= "</select>";

+			echo $location_filter;

+		?>

+		<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />

+	</div>

+<!-- </div> don't close ContentWrapper here, it happens later -->

+

+<div id="the-wire-updates-notice" class="ContentWrapper clearfloat"></div>

diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php
index 23541c0ac..ac809c2a0 100644
--- a/mod/riverdashboard/views/default/riverdashboard/welcome.php
+++ b/mod/riverdashboard/views/default/riverdashboard/welcome.php
@@ -1,17 +1,10 @@
-<?php
-
-	/**
-	 * Elgg thewire view page
-	 * 
-	 * @package ElggTheWire
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 */
-	 
-?>
-<div id="content_area_user_title">
-<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>
+<?php

+

+	/**

+	 * Elgg thewire view page

+	 */

+	 

+?>

+<div id="content_area_user_title">

+<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>

 </div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
index 2e0a434fb..1a581f96b 100644
--- a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
+++ b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
@@ -6,11 +6,4 @@
 		<option value="yes" <?php if ($vars['entity']->useasdashboard == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
 		<option value="no" <?php if ($vars['entity']->useasdashboard != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
 	</select>
-</p>
-<p>
-	<?php echo elgg_echo('riverdashboard:avataricon'); ?>
-	<select name="params[avatar_icon]">
-		<option value="icon" <?php if ($vars['entity']->avatar_icon == 'icon') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:icon'); ?></option>
-		<option value="avatar" <?php if ($vars['entity']->avatar_icon == 'avatar') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:avatar'); ?></option>
-	</select>
 </p>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/widgets/river_widget/edit.php b/mod/riverdashboard/views/default/widgets/river_widget/edit.php
deleted file mode 100644
index 3f3c9d625..000000000
--- a/mod/riverdashboard/views/default/widgets/river_widget/edit.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-	/**
-	 * Edit the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-	 
-	if(!$vars['entity']->content_type)
-		$content_type = 'mine';
-	else
-		$content_type = $vars['entity']->content_type;
-
-		
-?>
-<p>
-	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
-	
-	<select name="params[num_display]">
-		<option value="5" <?php if ($vars['entity']->num_display == 5) echo " selected=\"yes\" "; ?>>5</option>
-		<option value="8" <?php if (($vars['entity']->num_display == 8)) echo " selected=\"yes\" "; ?>>8</option>
-		<option value="12" <?php if ($vars['entity']->num_display == 12) echo " selected=\"yes\" "; ?>>12</option>
-		<option value="15" <?php if ($vars['entity']->num_display == 15) echo " selected=\"yes\" "; ?>>15</option>
-	</select>
-</p>
-<p>	
-	<?php echo elgg_echo('river:widget:type'); ?>
-	
-	<select name="params[content_type]">
-		<option value="mine" <?php if ($content_type == 'mine') echo " selected=\"yes\" "; ?>><?php echo elgg_echo("river:widgets:mine");?></option>
-		<option value="friends" <?php if ($content_type != 'mine') echo " selected=\"yes\" "; ?>><?php echo elgg_echo("river:widgets:friends");?></option>
-	</select>
-</p>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/widgets/river_widget/view.php b/mod/riverdashboard/views/default/widgets/river_widget/view.php
deleted file mode 100644
index 039962c27..000000000
--- a/mod/riverdashboard/views/default/widgets/river_widget/view.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-	/**
-	 * View the widget
-	 * 
-	 * @package ElggRiver
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	$owner = page_owner_entity();
-	
-	//get the type - mine or friends
-	$type = $vars['entity']->content_type;
-	if(!$type)
-		$type = "mine";
-		
-	//based on type grab the correct content type
-	if($type == "mine")
-		$content_type = '';
-	else
-		$content_type = 'friend';
-		
-	//get the number of items to display
-	$limit = $vars['entity']->num_display;
-	if(!$limit)
-		$limit = 4;
-	
-	//grab the river
-	$river = elgg_view_river_items($owner->getGuid(), 0, $content_type, $content[0], $content[1], '', $limit,0,0,false);
-	
-	//display
-	echo "<div class=\"contentWrapper\">";
-	if($type != 'mine')
-		echo "<div class='content_area_user_title'><h2>" . elgg_echo("friends") . "</h2></div>";
-	echo $river;
-	echo "</div>";
-	
-?>
\ No newline at end of file