From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Mar 2010 17:53:05 +0000
Subject: Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/annotate.php | 59 ++++++++++++++---------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

(limited to 'views/default/annotation/annotate.php')

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 0348a0ce8..9e0d20881 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,40 +1,27 @@
 <?php
-/**
- * Elgg comment river view 
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
 
-$performed_by = get_entity($vars['item']->subject_guid);
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-$subtype = get_subtype_from_id($object->subtype);
-
-//grab the annotation, if one exists
-if ($vars['item']->annotation_id != 0) {
-	$comment = get_annotation($vars['item']->annotation_id)->value;
-}
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
-$string .= "<div class=\"river_content_display\">";
-
-if ($comment) {
-	$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
-	if (strlen($contents) > 200) {
-		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
-	} else {
-		$string .= $contents;
+	$performed_by = get_entity($vars['item']->subject_guid);
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$title = $object->title;
+	if(!$title)
+		$title = elgg_echo('file:untitled');
+	$subtype = get_subtype_from_id($object->subtype);
+	//grab the annotation, if one exists
+	if($vars['item']->annotation_id != 0)
+		$comment = get_annotation($vars['item']->annotation_id)->value; 
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created) . "</div>";
+	if(get_context() != 'riverdashboard'){
+		$string .= "<div class=\"river_content_display\">";
+		if($comment){
+			$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
+			if(strlen($contents) > 200)
+	        		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+	    		else
+		    		$string .= $contents;
+       	}
+		$string .= "</div>";
 	}
-}
-
-$string .= "</div>";
-
 echo $string;
\ No newline at end of file
-- 
cgit v1.2.3