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

10 files changed, 58 insertions, 70 deletions

diff --git a/actions/comments/add.php b/actions/comments/add.php
index fde0a6f55..38c91c412 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -56,7 +56,7 @@ if ($entity->owner_guid != $user->guid) {
 system_message(elgg_echo("generic_comment:posted"));
 
 //add to river
-add_to_river('annotation/annotate', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
+add_to_river('river/annotation/generic_comment/create', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
 
 // Forward to the page the action occurred on
 forward(REFERER);
diff --git a/engine/lib/upgrades/2010121602.php b/engine/lib/upgrades/2010121602.php
new file mode 100644
index 000000000..2d55c8214
--- /dev/null
+++ b/engine/lib/upgrades/2010121602.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Create comment river view has been changed
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river
+			SET view='river/annotation/generic_comment/create', action_type='create'
+			WHERE view='annotation/annotate' AND action_type='comment'";
+update_data($query);
+
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index f3d93f5e3..39e1a7ad0 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -53,6 +53,7 @@ $english = array(
 
 	// river
 	'blog:river:create' => 'published a blog post',
+	'river:commented:object:blog' => 'the blog',
 );
 
 add_translation('en', $english);
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 9e661c276..dd317b5c7 100644
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -71,7 +71,7 @@
 	
 			'file:river:created' => "%s uploaded",
 			'file:river:item' => "a file",
-			'file:river:annotate' => "a comment on this file",
+			'river:commented:object:file' => 'the file',
 
 			'item:object:file' => 'Files',
 			
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index 1c20a4297..1fc5929b2 100644
--- a/mod/pages/languages/en.php
+++ b/mod/pages/languages/en.php
@@ -38,14 +38,13 @@ $english = array(
 	* River
 	**/
 
-	'pages:river:annotate' => "a comment on this page",
 	'pages:river:created' => "%s wrote",
 	'pages:river:updated' => "%s updated",
 	'pages:river:posted' => "%s posted",
 	'pages:river:create' => "a new page titled",
 	'pages:river:update' => "a page titled",
-	'page:river:annotate' => "a comment on this page",
-	'page_top:river:annotate' => "a comment on this page",
+	'river:commented:object:page' => 'the page',
+	'river:commented:object:page_top' => 'the page',
 
 	/**
 	 * Form fields
diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php
deleted file mode 100644
index 811fc7dea..000000000
--- a/mod/pages/views/default/river/object/page/annotate.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Page annotate river entry
- *
- * @package ElggPages
- */
-
-$statement = $vars['statement'];
-$performed_by = $statement->getSubject();
-$object = $statement->getObject();
-
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = elgg_echo("pages:river:posted", array($url)) . " ";
-$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("pages:river:annotate:create") . "</a> " . $object->title;
-//$string .= "<div class=\"river_content\">" . $object->title . "</div>";
-
-echo $string;
diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php
deleted file mode 100644
index e12eb55f9..000000000
--- a/mod/pages/views/default/river/object/page_top/annotate.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Top page annotation river view.
- *
- * @package ElggPages
- */
-
-$statement = $vars['statement'];
-$performed_by = $statement->getSubject();
-$object = $statement->getObject();
-
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = elgg_echo("pages:river:posted", array($url)) . " ";
-$string .= elgg_echo("pages:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-
-echo $string;
diff --git a/version.php b/version.php
index 5b6a77f0a..0fdd6a7fa 100644
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2010121601;
+$version = 2010121602;
 
 // Human-friendly version name
 $release = '1.8-svn';
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