River revamp for 1.8

18 files changed, 65 insertions, 251 deletions

diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index b626085d7..460c407d9 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -53,8 +53,9 @@ $english = array(
 	'blog:error:revision_not_found' => 'Cannot find this revision.',
 
 	// river
-	'blog:river:create' => 'published a blog post',
-	'river:commented:object:blog' => 'the blog',
+	
+	'river:create:object:blog' => '%s published a blog post %s',
+	'river:comment:object:blog' => '%s commented on the blog %s',
 
 	// widget
 	'blog:widget:description' => 'Display your latest blog posts',
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index bd2405d42..613cbb165 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->excerpt);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('blog:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 42865f8cf..1d32a0344 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -35,10 +35,10 @@ $english = array(
 	'bookmarks:visit' => "Visit resource",
 	'bookmarks:recent' => "Recent bookmarks",
 
-	'bookmarks:river:created' => 'bookmarked %s',
+	'river:create:object:bookmarks' => '%s bookmarked %s',
+	'river:comment:object:bookmarks' => '%s commented on a bookmark %s',
 	'bookmarks:river:annotate' => 'a comment on this bookmark',
 	'bookmarks:river:item' => 'an item',
-	'river:commented:object:bookmarks' => 'a bookmark',
 
 	'item:object:bookmarks' => 'Bookmarks',
 
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 743efdb22..984d109be 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,29 +8,8 @@
 $object = $vars['item']->getObjectEntity();
 $excerpt = elgg_get_excerpt($object->description);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-$link = elgg_echo('bookmarks:river:created', array($link));
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'attachments' => elgg_view('output/url', array('href' => $object->address)),
+));
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 7ced3f112..1db32afcb 100644
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -73,8 +73,8 @@ $english = array(
 
 	'file:display:number' => "Number of files to display",
 
-	'file:river:create' => 'uploaded the file',
-	'river:commented:object:file' => 'the file',
+	'river:create:object:file' => '%s uploaded the file %s',
+	'river:comment:object:file' => '%s commented on the file %s',
 
 	'item:object:file' => 'Files',
 
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index 620d1d18c..dad629120 100644
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('file:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 63a6df3a9..1afd42e86 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -210,10 +210,10 @@ or click below to view the group's join requests:
 		Forum river items
 	*/
 
-	'groups:river:create' => 'created the group',
-	'groups:river:join' => 'joined the group',
-	'forumtopic:river:create' => 'added a new discussion topic',
-	'groups:river:reply' => 'replied on the discussion topic',
+	'river:create:group:default' => '%s created the group %s',
+	'river:join:group:default' => '%s joined the group %s',
+	'river:create:object:groupforumtopic' => '%s added a new discussion topic %s',
+	'river:reply:object:groupforumtopic' => '%s replied on the discussion topic %s',
 	
 	'groups:nowidgets' => 'No widgets have been defined for this group.',
 
diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
index 1999c8dd9..cc94fbd43 100644
--- a/mod/groups/views/default/river/annotation/group_topic_post/reply.php
+++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
@@ -4,24 +4,9 @@
  */
 $object = $vars['item']->getObjectEntity();
 $reply = $vars['item']->getAnnotation();
+$excerpt = elgg_get_excerpt($reply->value);
 
-$url = $object->getURL();
-$title = $object->title;
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-echo elgg_echo('groups:river:reply') . ' ';
-echo $object_link;
-
-if ($reply) {
-	$excerpt = elgg_get_excerpt($reply->value);
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index a70f8b51d..cacb5ad3f 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,19 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-
-echo elgg_echo('groups:river:create');
-
-echo " $link";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index 466196921..cca44e523 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -7,34 +7,12 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
 
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('forumtopic:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
-
-if (elgg_is_logged_in() && $container->canWriteToContainer()) {
+if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
 	// inline comment form
 	$form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden');
 	$body_vars = array('entity' => $object, 'inline' => true);
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 060826649..d1c4c3ed3 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -3,14 +3,6 @@
  * Group join river view.
  */
 
-$object = $vars['item']->getObjectEntity();
-
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('groups:river:join');
-
-echo " $link";
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+));
diff --git a/mod/likes/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php
index 463fe5049..0160bcc0b 100644
--- a/mod/likes/views/default/river/annotation/likes/create.php
+++ b/mod/likes/views/default/river/annotation/likes/create.php
@@ -5,22 +5,6 @@
  * @todo not finished
  */
 
-$object = $vars['item']->getObjectEntity();
-$comment = $vars['item']->getAnnotation();
-
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:likes', array($type_string, $object_link));
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+));
diff --git a/mod/messageboard/languages/en.php b/mod/messageboard/languages/en.php
index d8ccbdeee..9027eb650 100644
--- a/mod/messageboard/languages/en.php
+++ b/mod/messageboard/languages/en.php
@@ -26,10 +26,7 @@ $english = array(
 	/**
 	 * Message board widget river
 	 */
-	'messageboard:river:added' => "posted on",
-	'messageboard:river:user' => "%s's",
-	'messageboard:river:messageboard' => "message board",
-
+	'river:messageboard:user:default' => "%s posted on %s's message board",
 
 	/**
 	 * Status messages
diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 0268930bf..975598805 100644
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -3,22 +3,9 @@
  * Messageboard river view
  */
 
-$performed_by = $vars['item']->getSubjectEntity();
-$performed_on = $vars['item']->getObjectEntity();
+$messageboard = $vars['item']->getAnnotation();
 
-$comment = $vars['item']->getAnnotation();
-
-$link = elgg_view('output/url', array(
-	'href' => $performed_on->getURL(),
-	'text' => elgg_echo('messageboard:river:user', array($performed_on->name)),
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $messageboard->value,
 ));
-
-echo elgg_echo("messageboard:river:added");
-echo " $link ";
-echo elgg_echo("messageboard:river:messageboard");
-
-if ($comment) {
-	echo '<div class="elgg-river-content">';
-	echo elgg_get_excerpt($comment->value);
-	echo '</div>';
-}
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index f590afb9c..1c6d0318c 100644
--- a/mod/pages/languages/en.php
+++ b/mod/pages/languages/en.php
@@ -38,13 +38,12 @@ $english = array(
 	* River
 	**/
 
-	'pages:river:create' => 'created the page',
-	'pages:river:created' => "%s wrote",
-	'pages:river:updated' => "%s updated",
-	'pages:river:posted' => "%s posted",
-	'pages:river:update' => "a page titled",
-	'river:commented:object:page' => 'the page',
-	'river:commented:object:page_top' => 'the page',
+	'river:create:object:page' => '%s created a page %s',
+	'river:create:object:page_top' => '%s created a page %s',
+	'river:update:object:page' => '%s updated a page %s',
+	'river:update:object:page_top' => '%s updated a page %s',
+	'river:comment:object:page' => '%s commented on a page titled %s',
+	'river:comment:object:page_top' => '%s commented on a page titled %s',
 
 	/**
 	 * Form fields
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index 032046063..ca15ddea7 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('pages:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index b55fb11d0..07f821e87 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -29,7 +29,7 @@ $english = array(
 	/**
 	 * The wire river
 	 */
-	'thewire:river:create' => "posted to the wire",
+	'river:create:object:thewire' => "%s posted to the wire",
 
 	/**
 	 * Wire widget
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index d4dac38ee..2e9cfd83b 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -7,18 +7,8 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = thewire_filter($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('thewire:river:create');
-
-echo " $link";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'summary' => false,
+));
\ No newline at end of file