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

diff --git a/languages/en.php b/languages/en.php
index f30f8ffd7bdfc04b29b11a883d1dea68a3f1303d..9ce523a4e4b9edbb616446bb77260740122c961f 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -385,6 +385,7 @@ $english = array(
        'river:posted:generic' => '%s posted',
        'riveritem:single:user' => 'a user',
        'riveritem:plural:user' => 'some users',
+       'river:ingroup' => 'to the group %s',
 
 /**
  * Notifications

diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index 9dc0ffdacabe94f193f8147d71f6a0da5e1ef5d8..bd2405d422bd5a4500b5902296c6a3841bd9bef5 100644 (file)
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -13,10 +13,20 @@ $params = array(
 );
 $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('blog:river:create');
 
-echo " $link";
+echo " $link $group_string";
 
 if ($excerpt) {
        echo '<div class="elgg-river-content">';

diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index f30097dd9a2a173e712880feffe715ba469e5fe2..bd07db08986e78453cce78932932c9f8fe8e1dc2 100644 (file)
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -13,35 +13,23 @@ $params = array(
 );
 $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('bookmarks:river:create');
 
-echo " $link";
+echo " $link $group_string";
 
 if ($excerpt) {
        echo '<div class="elgg-river-content">';
        echo $excerpt;
        echo '</div>';
 }
-
-return true;
-/**
- * Elgg bookmark river entry view
- */
-
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$is_group = get_entity($object->container_guid);
-$url = $object->getURL();
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = elgg_echo("bookmarks:river:created", array($url)) . " ";
-$string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
-if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
-       $string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
-}
-$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
-if (isloggedin()){
-       $string .= "<a class='river_comment_form_button link'>Comment</a>";
-       $string .= elgg_view('forms/likes/link', array('entity' => $object));
-}
-$string .= "</span>";
-echo $string;
\ No newline at end of file

diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index dd317b5c759c1cc765733ad664d12e749845d719..1372ae4cef243127049cce63a9dd0f4155fb6e79 100644 (file)
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -69,9 +69,7 @@
        
                        'file:display:number' => "Number of files to display",
        
-                       'file:river:created' => "%s uploaded",
-                       'file:river:item' => "a file",
-                       'river:commented:object:file' => 'the file',
+                       'file:river:create' => 'uploaded the file',
 
                        'item:object:file' => 'Files',
                        

diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index b9b5c42996985e0c8efe35f551ad63659a72d93c..620d1d18c61ea19a42dbb7a5c864708a65ec7af3 100644 (file)
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -1,17 +1,35 @@
 <?php
+/**
+ * File river view.
+ */
 
-       $performed_by = get_entity($vars['item']->subject_guid);
-       $object = get_entity($vars['item']->object_guid);
-       $url = $object->getURL();
-       $container = get_entity($object->container_guid);
+$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("file:river:created", array($url)) . " " . elgg_echo("file:river:item");
-       $string .= " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-       if ($container && $container instanceof ElggGroup) {
-               $string .= ' ' . elgg_echo('groups:river:togroup') . " <a href=\"" . $container->getURL() ."\">". $container->name . "</a>";
-       }
+$params = array(
+       'href' => $object->getURL(),
+       'text' => $object->title,
+);
+$link = elgg_view('output/url', $params);
 
-       echo $string;
+$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));
+}
 
-?>
\ No newline at end of file
+echo elgg_echo('file:river:create');
+
+echo " $link $group_string";
+
+if ($excerpt) {
+       echo '<div class="elgg-river-content">';
+       echo $excerpt;
+       echo '</div>';
+}

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 3baf02e69ca23400884129f831b1a1bb9fac7d32..45872277e9e7c6061db3633bd912b0913224c724 100644 (file)
--- 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 ae55df03b441f213c959843062eaa4ca0a1008f4..a70f8b51d01d34433c7fdd924ebeb0b48f9f6099 100644 (file)
--- 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>';
+}