From 1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec Mon Sep 17 00:00:00 2001
From: Evan Winslow <evan@elgg.org>
Date: Wed, 8 Jun 2011 02:31:30 -0700
Subject: River revamp for 1.8

---
 mod/pages/languages/en.php                         | 13 +++++-----
 .../views/default/river/object/page/create.php     | 30 +++-------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

(limited to 'mod/pages')

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
-- 
cgit v1.2.3