3 files changed, 81 insertions, 18 deletions

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index f9ecbc03c..7eebb0c99 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -6,28 +6,55 @@
  */
 
 $item = $vars['item'];
-$subject = $item->getSubjectEntity();
+
+$menu = elgg_view_menu('river', array('item' => $item, 'sort_by' => 'priority'));
 
 // 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 = elgg_view_menu('river', array('item' => $item, 'sort_by' => 'priority'));
-$header .= "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
+$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',
+	));
+}
+
+$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\">$attachments</div>";
+}
 
-// body
-$body = elgg_view($item->getView(), array('item' => $item));
+$responses = elgg_extract('responses', $vars, false);
+if ($responses === false) {
+	$responses = elgg_view('river/elements/responses', $vars);
+}
+if ($responses) {
+	$responses = "<div class=\"elgg-river-responses\">$responses</div>";
+}
 
-// footer
-$footer = elgg_view('river/elements/footer', $vars);
+$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,
+	));
+	$group_string = elgg_echo('river:ingroup', array($group_link));
+}
 
-echo elgg_view('page/components/module', array(
-	'header' => $header,
-	'body' => $body,
-	'footer' => $footer,
-	'class' => 'mbn',
-));
\ No newline at end of file
+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/elements/footer.php b/views/default/river/elements/responses.php
index f1e79f131..f1e79f131 100644
--- a/views/default/river/elements/footer.php
+++ b/views/default/river/elements/responses.php
diff --git a/views/default/river/elements/summary.php b/views/default/river/elements/summary.php
new file mode 100644
index 000000000..eee8754e2
--- /dev/null
+++ b/views/default/river/elements/summary.php
@@ -0,0 +1,36 @@
+<?php
+
+$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',
+));
+
+$object_link = elgg_view('output/url', array(
+	'href' => $object->getURL(),
+	'text' => $object->title ? $object->title : $object->name,
+	'class' => 'elgg-river-object',
+));
+
+$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,
+	);
+	$group_link = elgg_view('output/url', $params);
+	$group_string = elgg_echo('river:ingroup', array($group_link));
+}
+
+
+echo elgg_echo("river:$action:$type:$subtype", array($subject_link, $object_link));
\ No newline at end of file