From 538a22b85384008533aeef2ac356ff668766e0cb Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 7 Apr 2010 14:10:51 +0000
Subject: Riverdashboard refreshed, and updated display of comments and likes
 (the loading of these needs to be moved to ajax callbacks)

git-svn-id: http://code.elgg.org/elgg/trunk@5643 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/river/item/wrapper.php           | 99 +++++++++++++---------
 1 file changed, 61 insertions(+), 38 deletions(-)

(limited to 'mod/riverdashboard/views/default/river')

diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 0dba70e5c..dba6f9953 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -8,6 +8,8 @@
 $object = get_entity($vars['item']->object_guid);
 //get object url
 $object_url = $object->getURL();
+$numoflikes = elgg_count_likes($object);
+
 //user
 //if displaying on the profile get the object owner, else the subject_guid
 if(get_context() == 'profile' && $object->getSubtype() ==  'thewire')
@@ -29,7 +31,7 @@ switch($vars['item']->subtype){
 //count comment annotations
 $comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment);
 
-//get last two comments display
+//get last three comments display
 $get_comments = get_annotations($vars['item']->object_guid, "", "", $annotation_comment, "", "", 3, 0, "desc");
 
 if($get_comments){
@@ -37,7 +39,7 @@ if($get_comments){
 	$get_comments = array_reverse($get_comments);	
 }
 
-//minus two off the comment total as we display two by default
+//minus 3 off the comment total as we display 3 by default
 if($comment_count < 3)
 	$num_comments = 0;
 else
@@ -48,32 +50,40 @@ else
 		<?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
 	</span>
 	<div class="river_item_contents clearfloat">
-		<!-- body contents, generated by the river view in each plugin -->
-		<?php echo $vars['body']; ?>
-	</div>
+	<?php 
+		// body contents, generated by the river view in each plugin
+		echo $vars['body'];	
 	
-<!-- display comments and likes -->
-<?php
-	//likes
-	echo "<div class='river_comments'>";
-	echo "<div class='river_comment latest clearfloat'>";
-	echo elgg_view_likes($object);
-	echo "</div></div>";
-	//display latest 2 comments if there are any
+	//display latest 3 comments if there are any
 	if($get_comments){
 		$counter = 0;
-		$background = "";
-		echo "<div class='river_comments'>";
+		//$background = "";
 			
-		//display the number of comments if there are any
-		if($num_comments != 0){
-			//set the correct context comment or comments
-			if($num_comments == 1)
-				echo "<a class='river_more_comments' href=\"{$object_url}\">+{$num_comments} more comment</a>";
-			else
-				echo "<a class='river_more_comments' href=\"{$object_url}\">+{$num_comments} more comments</a>";
+		echo "<div class='river_comments_tabs clearfloat'>";
+		
+		if($comment_count <= 3) {
+			echo "<a class='river_more_comments show_comments_button link'>Comments</a>";
+		}	
+		
+		//display 'more comments' if there are any
+		if($num_comments != 0){			
+			echo "<a class='river_more_comments show_comments_button link'>Comments (+{$num_comments} more)</a>";
 		}
-			
+		
+		if($numoflikes != 0){
+			echo elgg_view('likes/forms/display', array('entity' => $object));
+		}
+		echo "</div>"; // close river_comments_tabs
+		
+		echo "<div class='river_comments'>";
+
+		if($numoflikes != 0){
+			//show the users who liked the object
+			echo "<div class='likes_list hidden'>";
+			echo list_annotations($object->getGUID(), 'likes', 99);
+			echo "</div>";
+		}
+		
 		foreach($get_comments as $gc){
 			//get the comment owner
 			$comment_owner = get_user($gc->owner_guid);
@@ -92,7 +102,7 @@ else
 			echo "</span>";
 			//truncate comment to 150 characters
 			if(strlen($gc->value) > 150) {
-		        	$gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "...";
+		        	$gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "&hellip;";
 		    }
 			$contents = strip_tags($gc->value);
 		    echo "<div class='river_comment_contents'>";
@@ -101,20 +111,33 @@ else
 			echo "</div></div>";
 			$counter++;
 		}
+			echo elgg_make_river_comment($object);
+			echo "</div>"; // close river_comments
+	} else {
+		// tab bar nav - for users that liked object
+		echo "<div class='river_comments_tabs clearfloat'>";
+			$numoflikes = elgg_count_likes($object);
+			if($numoflikes != 0){
+				echo elgg_view('likes/forms/display', array('entity' => $object));
+			}	
+		echo "</div>"; // close river_comments_tabs
+		
+		echo "<div class='river_comments'>";
+		
+		if($numoflikes != 0){
+			//show the users who liked the object
+			echo "<div class='likes_list hidden'>";
+			echo list_annotations($object->getGUID(), 'likes', 99);
 			echo "</div>";
 		}
-			//display the comment link
-		if($vars['item']->type != 'user'){
-			//for now don't display the comment link on wire and conversations for now
-			if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'conversations' && $vars['item']->subtype != '')
-				//don't display the comment option on group discussions atm
-				if($vars['item']->subtype == 'groupforumtopic'){
-					echo "<a class='comment_link' href=\"{$object_url}\">Visit discussion</a>";
-				}else{
-					echo "<div class='river_post_comment'>";
-					echo elgg_make_river_comment($object);
-					echo "</div>";
-				}
-			}
-		?>
+		
+		// if there are no comments to display
+		// and this is not a user or a group discussion entry - include the inline comment form
+		if($vars['item']->type != 'user' && $vars['item']->subtype != 'groupforumtopic') {
+			echo elgg_make_river_comment($object);
+		}
+		echo "</div>";
+	}
+echo "</div>"; // close river_item_contents
+?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3