13 files changed, 232 insertions, 151 deletions

diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
index aabb6a9c6..7d586450d 100644
--- a/views/default/river/annotation/generic_comment/create.php
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -5,26 +5,7 @@
 $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:generic_comment', array($type_string, $object_link));
-
-if ($comment) {
-	$excerpt = elgg_get_excerpt($comment->value);
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => elgg_get_excerpt($comment->value),
+));
diff --git a/views/default/river/annotation/likes/create.php b/views/default/river/annotation/likes/create.php
deleted file mode 100644
index 374f4a381..000000000
--- a/views/default/river/annotation/likes/create.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Likes river view
- */
-$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));
diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
new file mode 100644
index 000000000..2cd7f2289
--- /dev/null
+++ b/views/default/river/elements/body.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Body of river item
+ *
+ * @uses $vars['item']        ElggRiverItem
+ * @uses $vars['summary']     Alternate summary (the short text summary of action)
+ * @uses $vars['message']     Optional message (usually excerpt of text)
+ * @uses $vars['attachments'] Optional attachments (displaying icons or other non-text data)
+ * @uses $vars['responses']   Alternate respones (comments, replies, etc.)
+ */
+
+$item = $vars['item'];
+
+$menu = elgg_view_menu('river', array(
+	'item' => $item,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+// river item header
+$timestamp = elgg_view_friendly_time($item->getPostedTime());
+
+$summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item'])));
+if ($summary === false) {
+	$subject = $item->getSubjectEntity();
+	$summary = elgg_view('output/url', array(
+		'href' => $subject->getURL(),
+		'text' => $subject->name,
+		'class' => 'elgg-river-subject',
+		'is_trusted' => true,
+	));
+}
+
+$message = elgg_extract('message', $vars, false);
+if ($message !== false) {
+	$message = "<div class=\"elgg-river-message\">$message</div>";
+}
+
+$attachments = elgg_extract('attachments', $vars, false);
+if ($attachments !== false) {
+	$attachments = "<div class=\"elgg-river-attachments clearfix\">$attachments</div>";
+}
+
+$responses = elgg_view('river/elements/responses', $vars);
+if ($responses) {
+	$responses = "<div class=\"elgg-river-responses\">$responses</div>";
+}
+
+$group_string = '';
+$object = $item->getObjectEntity();
+$container = $object->getContainerEntity();
+if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) {
+	$group_link = elgg_view('output/url', array(
+		'href' => $container->getURL(),
+		'text' => $container->name,
+		'is_trusted' => true,
+	));
+	$group_string = elgg_echo('river:ingroup', array($group_link));
+}
+
+echo <<<RIVER
+$menu
+<div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div>
+$message
+$attachments
+$responses
+RIVER;
diff --git a/views/default/river/item/image.php b/views/default/river/elements/image.php
index 9caa44b36..6f6aeae65 100644
--- a/views/default/river/item/image.php
+++ b/views/default/river/elements/image.php
@@ -9,4 +9,8 @@
 
 $subject = $vars['item']->getSubjectEntity();
 
-echo elgg_view_entity_icon($subject, 'small');
+if (elgg_in_context('widgets')) {
+	echo elgg_view_entity_icon($subject, 'tiny');
+} else {
+	echo elgg_view_entity_icon($subject, 'small');
+}
diff --git a/views/default/river/elements/layout.php b/views/default/river/elements/layout.php
new file mode 100644
index 000000000..94622e272
--- /dev/null
+++ b/views/default/river/elements/layout.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Layout of a river item
+ *
+ * @uses $vars['item'] ElggRiverItem
+ */
+
+$item = $vars['item'];
+
+echo elgg_view('page/components/image_block', array(
+	'image' => elgg_view('river/elements/image', $vars),
+	'body' => elgg_view('river/elements/body', $vars),
+	'class' => 'elgg-river-item',
+));
diff --git a/views/default/river/item/footer.php b/views/default/river/elements/responses.php
index 7cf9dd925..f6c32e142 100644
--- a/views/default/river/item/footer.php
+++ b/views/default/river/elements/responses.php
@@ -1,8 +1,18 @@
 <?php
 /**
  * River item footer
+ *
+ * @uses $vars['item'] ElggRiverItem
+ * @uses $vars['responses'] Alternate override for this item
  */
 
+// allow river views to override the response content
+$responses = elgg_extract('responses', $vars, false);
+if ($responses) {
+	echo $responses;
+	return true;
+}
+
 $item = $vars['item'];
 $object = $item->getObjectEntity();
 
@@ -40,6 +50,7 @@ if ($comments) {
 		$params = array(
 			'href' => $url,
 			'text' => elgg_echo('river:comments:more', array($num_more_comments)),
+			'is_trusted' => true,
 		);
 		$link = elgg_view('output/url', $params);
 		echo "<div class=\"elgg-river-more\">$link</div>";
@@ -47,6 +58,6 @@ if ($comments) {
 }
 
 // inline comment form
-echo elgg_view_form('comments/add', array(
-	'id' => "comments-add-{$object->getGUID()}",
-), array('entity' => $object, 'inline' => true));
+$form_vars = array('id' => "comments-add-{$object->getGUID()}", 'class' => 'hidden');
+$body_vars = array('entity' => $object, 'inline' => true);
+echo elgg_view_form('comments/add', $form_vars, $body_vars);
diff --git a/views/default/river/elements/summary.php b/views/default/river/elements/summary.php
new file mode 100644
index 000000000..d7bde51dd
--- /dev/null
+++ b/views/default/river/elements/summary.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Short summary of the action that occurred
+ *
+ * @vars['item'] ElggRiverItem
+ */
+
+$item = $vars['item'];
+
+$subject = $item->getSubjectEntity();
+$object = $item->getObjectEntity();
+$target = $object->getContainerEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$object_text = $object->title ? $object->title : $object->name;
+$object_link = elgg_view('output/url', array(
+	'href' => $object->getURL(),
+	'text' => elgg_get_excerpt($object_text, 100),
+	'class' => 'elgg-river-object',
+	'is_trusted' => true,
+));
+
+$action = $item->action_type;
+$type = $item->type;
+$subtype = $item->subtype ? $item->subtype : 'default';
+
+$container = $object->getContainerEntity();
+if ($container instanceof ElggGroup) {
+	$params = array(
+		'href' => $container->getURL(),
+		'text' => $container->name,
+		'is_trusted' => true,
+	);
+	$group_link = elgg_view('output/url', $params);
+	$group_string = elgg_echo('river:ingroup', array($group_link));
+}
+
+// check summary translation keys.
+// will use the $type:$subtype if that's defined, otherwise just uses $type:default
+$key = "river:$action:$type:$subtype";
+$summary = elgg_echo($key, array($subject_link, $object_link));
+
+if ($summary == $key) {
+	$key = "river:$action:$type:default";
+	$summary = elgg_echo($key, array($subject_link, $object_link));
+}
+
+echo $summary;
\ No newline at end of file
diff --git a/views/default/river/item.php b/views/default/river/item.php
index 55e108482..75767e08d 100644
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -1,11 +1,30 @@
 <?php
+/**
+ * Primary river item view
+ *
+ * Calls the individual view saved for that river item. Most of these
+ * individual river views then use the views in river/elements.
+ *
+ * @uses $vars['item'] ElggRiverItem
+ */
+
+// @todo remove this in Elgg 1.9
+global $_elgg_special_river_catch;
+if (!isset($_elgg_special_river_catch)) {
+	$_elgg_special_river_catch = false;
+}
+if ($_elgg_special_river_catch) {
+	// we changed the views a little in 1.8.1 so this catches the plugins that
+	// were updated in 1.8.0 and redirects to the layout view
+	echo elgg_view('river/elements/layout', $vars);
+	return true;
+}
+$_elgg_special_river_catch = true;
+
+
 $item = $vars['item'];
 
-$vars = array(
-	'image' => elgg_view('river/item/image', array('item' => $item)),
-	'body' => elgg_view('river/item/body', array('item' => $item)),
-	'image_alt' => elgg_view('river/item/controls', array('item' => $item)),
-	'class' => 'elgg-river-item',
-);
+echo elgg_view($item->getView(), $vars);
+
 
-echo elgg_view('page/components/image_block', $vars);
\ No newline at end of file
+$_elgg_special_river_catch = false;
diff --git a/views/default/river/item/body.php b/views/default/river/item/body.php
deleted file mode 100644
index 7d36222ac..000000000
--- a/views/default/river/item/body.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Body of river item
- *
- * @uses $vars['item']
- */
-
-$item = $vars['item'];
-$subject = $item->getSubjectEntity();
-
-// river item header
-$params = array(
-	'href' => $subject->getURL(),
-	'text' => $subject->name,
-);
-$subject_link = elgg_view('output/url', $params);
-$timestamp = elgg_get_friendly_time($item->getPostedTime());
-$header = "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
-
-// body
-$body = elgg_view($item->getView(), array('item' => $item));
-
-// footer
-$footer = elgg_view('river/item/footer', $vars);
-
-echo elgg_view('page/components/module', array(
-	'header' => $header,
-	'body' => $body,
-	'footer' => $footer,
-	'show_inner' => false,
-));
\ No newline at end of file
diff --git a/views/default/river/item/controls.php b/views/default/river/item/controls.php
deleted file mode 100644
index 50c1ae09e..000000000
--- a/views/default/river/item/controls.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Controls on an river item
- *
- *
- * @uses $vars['item']
- */
-
-$object = $vars['item']->getObjectEntity();
-
-if (elgg_is_logged_in()) {
-	// comments and non-objects cannot be commented on or liked
-	if ($vars['item']->annotation_id == 0) {
-		// comments
-		if ($object->canComment()) {
-			elgg_register_menu_item('river', array(
-				'name' => 'comment',
-				'href' => "#comments-add-$object->guid",
-				'text' => elgg_echo('generic_comments:text'),
-				'class' => "elgg-toggler",
-			));
-		}
-
-		// like this
-		if ($object->canAnnotate(0, 'likes')) {
-			if (!elgg_annotation_exists($object->getGUID(), 'likes')) {
-				
-				elgg_register_menu_item('river', array(
-					'name' => 'likes',
-					'href' => "action/likes/add?guid={$object->getGUID()}",
-					'text' => elgg_echo('likes:likethis'),
-					'is_action' => true,
-				));
-			} else {
-				$likes = elgg_get_annotations(array(
-					'guid' => $guid,
-					'annotation_name' => 'likes',
-					'owner_guid' => elgg_get_logged_in_user_guid()
-				));
-
-				elgg_register_menu_item('river', array(
-					'href' => "action/likes/delete?annotation_id={$likes[0]->id}",
-					'text' => elgg_echo('likes:remove'),
-					'is_action' => true,
-				));
-			}
-		}
-	}
-
-	echo elgg_view_menu('river', array('sort_by' => 'priority', 'item' => $vars['item']));
-}
\ No newline at end of file
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index 4fbd7b01a..0408d79e1 100644
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -5,18 +5,10 @@
 $subject = $vars['item']->getSubjectEntity();
 $object = $vars['item']->getObjectEntity();
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->name,
-);
-$object_link = elgg_view('output/url', $params);
 $subject_icon = elgg_view_entity_icon($subject, 'tiny');
 $object_icon = elgg_view_entity_icon($object, 'tiny');
 
-echo elgg_echo("friends:river:add", array($object_link));
-
-echo '<div class="elgg-river-content clearfix">';
-echo $subject_icon;
-echo elgg_view_icon('following');
-echo $object_icon;
-echo '</div>';
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'attachments' => $subject_icon . elgg_view_icon('arrow-right') . $object_icon,
+));
diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php
new file mode 100644
index 000000000..271064a06
--- /dev/null
+++ b/views/default/river/user/default/profileiconupdate.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Update avatar river view
+ */
+
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$string = elgg_echo('river:update:user:avatar', array($subject_link));
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'summary' => $string,
+	'attachments' => elgg_view_entity_icon($subject, 'tiny', array(
+		'use_hover' => false,
+		'use_link' => false,
+	)),
+));
diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php
new file mode 100644
index 000000000..ce72970d6
--- /dev/null
+++ b/views/default/river/user/default/profileupdate.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Update profile river view
+ */
+
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$string = elgg_echo('river:update:user:profile', array($subject_link));
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'summary' => $string,
+));