From bc21e6778ffd5b4b4f2828fd720dc6590870f46f Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 17 Dec 2010 01:22:00 +0000
Subject: updated the river generic_comment view for the new river code

git-svn-id: http://code.elgg.org/elgg/trunk@7650 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/annotate.php              | 31 ----------------
 .../river/annotation/generic_comment/create.php    | 42 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 31 deletions(-)
 delete mode 100644 views/default/annotation/annotate.php
 create mode 100644 views/default/river/annotation/generic_comment/create.php

(limited to 'views')

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
deleted file mode 100644
index d9deb6301..000000000
--- a/views/default/annotation/annotate.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-$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
-$comment = '';
-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 = elgg_echo("river:posted:generic", array($url)) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
-$string .= elgg_view('forms/likes/link', array('entity' => $object));
-$string .= "</span>";
-if (elgg_get_context() != 'riverdashboard') {
-	$comment = elgg_get_excerpt($comment, 200);
-	if ($comment) {
-		$string .= "<div class='river_content_display'>";
-		$string .= $comment;
-		$string .= "</div>";
-	}
-}
-echo $string;
\ No newline at end of file
diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
new file mode 100644
index 000000000..5198a98a8
--- /dev/null
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Post comment river view
+ */
+$object = $vars['item']->getObjectEntity();
+$comment = $vars['item']->getAnnotation();
+
+$url = $object->getURL();
+$title = $object->title;
+if (!$title) {
+	$title = elgg_echo('untitled');
+}
+$object_link = "<a href=\"{$object->getURL()}\">$title</a>";
+
+$type = $object->getType();
+$subtype = $object->getSubtype();
+
+$type_string = elgg_echo("river:commented:$type:$subtype");
+echo elgg_echo('river:generic_comment', array($type_string, $object_link));
+
+if ($comment) {
+	$excerpt = elgg_get_excerpt($comment->value);
+	echo '<div class="elgg-river-excerpt">';
+	echo $excerpt;
+	echo '</div>';
+}
+
+/*
+$string = elgg_echo("river:posted:generic", array($url)) . " ";
+$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a>";
+$string .= "</span>";
+if (elgg_get_context() != 'riverdashboard') {
+	$comment = elgg_get_excerpt($comment, 200);
+	if ($comment) {
+		$string .= "<div class='river_content_display'>";
+		$string .= $comment;
+		$string .= "</div>";
+	}
+}
+echo $string;
+ * 
+ */
\ No newline at end of file
-- 
cgit v1.2.3