From 152a6ae4f00f6e0407d9a7ba04ae0000a818c554 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 17 Dec 2010 12:23:35 +0000
Subject: supporting putting content in groups in for river views and added
 file river code

git-svn-id: http://code.elgg.org/elgg/trunk@7658 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/languages/en.php                     |  2 +-
 mod/groups/views/default/river/group/create.php | 33 ++++++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'mod/groups')

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 3baf02e69..45872277e 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -179,8 +179,8 @@ or click below to view the group's join requests:
 		Forum river items
 	*/
 
+	'groups:river:create' => 'created the group',
 	'groups:river:member' => '%s is now a member of',
-	'groups:river:create' => '%s created a new group called',
 	'groupforum:river:updated' => '%s has updated',
 	'groupforum:river:update' => 'this discussion topic',
 	'groupforum:river:created' => '%s has created',
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index ae55df03b..a70f8b51d 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -1,16 +1,25 @@
 <?php
+/**
+ * Group creation river view.
+ */
 
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$objecturl = $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>";
-	$string = elgg_echo("groups:river:create", array($url)) . " ";
-	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
-	if (isloggedin()) {
-		$string .= elgg_view('forms/likes/link', array('entity' => $object));
-	}
-	$string .= "</span>";
+$params = array(
+	'href' => $object->getURL(),
+	'text' => $object->name,
+);
+$link = elgg_view('output/url', $params);
 
-echo $string;
\ No newline at end of file
+
+echo elgg_echo('groups:river:create');
+
+echo " $link";
+
+if ($excerpt) {
+	echo '<div class="elgg-river-content">';
+	echo $excerpt;
+	echo '</div>';
+}
-- 
cgit v1.2.3