3 files changed, 8 insertions, 50 deletions
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 4f913dbaa..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 = sprintf(elgg_echo("pages:river:posted"),$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/create.php b/mod/pages/views/default/river/object/page/create.php
index d182a1ebe..4c31def33 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -1,22 +1,13 @@
 <?php
 /**
- * Page create river view
- *
- * @package ElggPages
+ * Page river view.
  */
 
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->description);
+$excerpt = elgg_get_excerpt($excerpt);
 
-
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
-$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
-$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
-$string .= elgg_view('likes/forms/link', array('entity' => $object));
-$string .= "<div class=\"river_content_display\">";
-$string .= elgg_get_excerpt($contents, 200);
-$string .= "</div>";
-
-echo $string;
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
+\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php
deleted file mode 100644
index 82b38f315..000000000
--- a/mod/pages/views/default/river/object/page/update.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Page update river view
- *
- * @package ElggPages
- */
-
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
-$string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-
-echo $string;