River revamp for 1.8

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 45b2c35f847ed9264ab73e3c9ea422183ad032d3..4911171c8e58548f4eefe1318d7d3b2f402123cc 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1203,7 +1203,7 @@ function elgg_view_river_item($item, array $vars = array()) {
 
        $vars['item'] = $item;
 
-       return elgg_view('river/item', $vars);
+       return elgg_view($item->getView(), $vars);
 }
 
 /**

diff --git a/languages/en.php b/languages/en.php
index 46ac19a34b403d61fe0bbc75b577531d349e6339..cbe229c2661d551b82140d9390954fa09db37d0d 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -344,7 +344,7 @@ $english = array(
        'friends:collections:members' => "Collection members",
        'friends:collections:edit' => "Edit collection",
 
-       'friends:river:add' => "is now a friend with %s",
+       'river:friend:user:default' => "%s is now a friend with %s",
 
        'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 
@@ -410,7 +410,7 @@ $english = array(
        'river:posted:generic' => '%s posted',
        'riveritem:single:user' => 'a user',
        'riveritem:plural:user' => 'some users',
-       'river:ingroup' => 'to the group %s',
+       'river:ingroup' => 'in the group %s',
        'river:none' => 'No activity',
 
        'river:widget:title' => "Activity",

diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index b626085d78f7b591add96ae525d802bc0e256318..460c407d98d8beb626129c0803c52b07721396c8 100644 (file)
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -53,8 +53,9 @@ $english = array(
        'blog:error:revision_not_found' => 'Cannot find this revision.',
 
        // river
-       'blog:river:create' => 'published a blog post',
-       'river:commented:object:blog' => 'the blog',
+       
+       'river:create:object:blog' => '%s published a blog post %s',
+       'river:comment:object:blog' => '%s commented on the blog %s',
 
        // widget
        'blog:widget:description' => 'Display your latest blog posts',

diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index bd2405d422bd5a4500b5902296c6a3841bd9bef5..613cbb165916622509302cd7f204cc9bf3b71c62 100644 (file)
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->excerpt);
 $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('blog: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

diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 42865f8cfd032d0e454176dbc6578a5a3169d1c9..1d32a034460977623fa09d6213ac76045eb144ff 100644 (file)
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -35,10 +35,10 @@ $english = array(
        'bookmarks:visit' => "Visit resource",
        'bookmarks:recent' => "Recent bookmarks",
 
-       'bookmarks:river:created' => 'bookmarked %s',
+       'river:create:object:bookmarks' => '%s bookmarked %s',
+       'river:comment:object:bookmarks' => '%s commented on a bookmark %s',
        'bookmarks:river:annotate' => 'a comment on this bookmark',
        'bookmarks:river:item' => 'an item',
-       'river:commented:object:bookmarks' => 'a bookmark',
 
        'item:object:bookmarks' => 'Bookmarks',
 

diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 743efdb2279278bd275cf472006c235c3614dccc..984d109be0833855d734925528b37fe076ea9ad8 100644 (file)
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,29 +8,8 @@
 $object = $vars['item']->getObjectEntity();
 $excerpt = elgg_get_excerpt($object->description);
 
-$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));
-}
-
-$link = elgg_echo('bookmarks:river:created', array($link));
-
-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,
+       'attachments' => elgg_view('output/url', array('href' => $object->address)),
+));

diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 7ced3f112aab1bfa4ff677738bed8ad0181da3ed..1db32afcb80f44c8a31ee4d49cbf1e111966eea0 100644 (file)
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -73,8 +73,8 @@ $english = array(
 
        'file:display:number' => "Number of files to display",
 
-       'file:river:create' => 'uploaded the file',
-       'river:commented:object:file' => 'the file',
+       'river:create:object:file' => '%s uploaded the file %s',
+       'river:comment:object:file' => '%s commented on the file %s',
 
        '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 620d1d18c61ea19a42dbb7a5c864708a65ec7af3..dad629120777a904e4ec5972d12c3a5bc2fa959b 100644 (file)
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/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('file: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

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 63a6df3a99fd4578e2af80ccf5aea7e5e4424bd8..1afd42e860846eb7549ae77367f46a760a798680 100644 (file)
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -210,10 +210,10 @@ or click below to view the group's join requests:
                Forum river items
        */
 
-       'groups:river:create' => 'created the group',
-       'groups:river:join' => 'joined the group',
-       'forumtopic:river:create' => 'added a new discussion topic',
-       'groups:river:reply' => 'replied on the discussion topic',
+       'river:create:group:default' => '%s created the group %s',
+       'river:join:group:default' => '%s joined the group %s',
+       'river:create:object:groupforumtopic' => '%s added a new discussion topic %s',
+       'river:reply:object:groupforumtopic' => '%s replied on the discussion topic %s',
        
        'groups:nowidgets' => 'No widgets have been defined for this group.',
 

diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
index 1999c8dd92dbf176e3616f59b977ae6d59e7c64e..cc94fbd43b30cfa2b09896ebab220e6f2c88d795 100644 (file)
--- a/mod/groups/views/default/river/annotation/group_topic_post/reply.php
+++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
@@ -4,24 +4,9 @@
  */
 $object = $vars['item']->getObjectEntity();
 $reply = $vars['item']->getAnnotation();
+$excerpt = elgg_get_excerpt($reply->value);
 
-$url = $object->getURL();
-$title = $object->title;
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-echo elgg_echo('groups:river:reply') . ' ';
-echo $object_link;
-
-if ($reply) {
-       $excerpt = elgg_get_excerpt($reply->value);
-       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

diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index a70f8b51d01d34433c7fdd924ebeb0b48f9f6099..cacb5ad3f85c8de655db5be84e46adae324bba20 100644 (file)
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,19 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-
-echo elgg_echo('groups:river:create');
-
-echo " $link";
-
-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

diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index 466196921d13e98d8381b9e3884aeaa2662d6a5c..cca44e52344a6b1204142304bd129bbf5a793dfc 100644 (file)
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -7,34 +7,12 @@ $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);
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+       'message' => $excerpt,
+));
 
-$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('forumtopic:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-       echo '<div class="elgg-river-content">';
-       echo $excerpt;
-       echo '</div>';
-}
-
-if (elgg_is_logged_in() && $container->canWriteToContainer()) {
+if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
        // inline comment form
        $form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden');
        $body_vars = array('entity' => $object, 'inline' => true);

diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 06082664958685f46cf7f8205330958eea7446b9..d1c4c3ed383d8a5481237c11cafc86122672ac34 100644 (file)
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -3,14 +3,6 @@
  * Group join river view.
  */
 
-$object = $vars['item']->getObjectEntity();
-
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('groups:river:join');
-
-echo " $link";
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+));

diff --git a/mod/likes/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php
index 463fe504939cecbe41c1c1493e31183b531c0e86..0160bcc0b07c7ca51409a49e701bcb0708a3bf7b 100644 (file)
--- a/mod/likes/views/default/river/annotation/likes/create.php
+++ b/mod/likes/views/default/river/annotation/likes/create.php
@@ -5,22 +5,6 @@
  * @todo not finished
  */
 
-$object = $vars['item']->getObjectEntity();
-$comment = $vars['item']->getAnnotation();
-
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-       $title = elgg_echo('untitled');
-}
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:likes', array($type_string, $object_link));
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+));

diff --git a/mod/messageboard/languages/en.php b/mod/messageboard/languages/en.php
index d8ccbdeee91fcbf9ed2a9395fe38363890b99c76..9027eb6504e1767a2ee1bfae297764cab92f1daa 100644 (file)
--- a/mod/messageboard/languages/en.php
+++ b/mod/messageboard/languages/en.php
@@ -26,10 +26,7 @@ $english = array(
        /**
         * Message board widget river
         */
-       'messageboard:river:added' => "posted on",
-       'messageboard:river:user' => "%s's",
-       'messageboard:river:messageboard' => "message board",
-
+       'river:messageboard:user:default' => "%s posted on %s's message board",
 
        /**
         * Status messages

diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 0268930bf6f0dd6b84310ee73c551a5a84d30aca..975598805f9efa76c525fe35476e733cb8dd33b0 100644 (file)
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -3,22 +3,9 @@
  * Messageboard river view
  */
 
-$performed_by = $vars['item']->getSubjectEntity();
-$performed_on = $vars['item']->getObjectEntity();
+$messageboard = $vars['item']->getAnnotation();
 
-$comment = $vars['item']->getAnnotation();
-
-$link = elgg_view('output/url', array(
-       'href' => $performed_on->getURL(),
-       'text' => elgg_echo('messageboard:river:user', array($performed_on->name)),
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+       'message' => $messageboard->value,
 ));
-
-echo elgg_echo("messageboard:river:added");
-echo " $link ";
-echo elgg_echo("messageboard:river:messageboard");
-
-if ($comment) {
-       echo '<div class="elgg-river-content">';
-       echo elgg_get_excerpt($comment->value);
-       echo '</div>';
-}

diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index f590afb9cdbd8bcff153a792cda9fa723a37bb11..1c6d0318cfc6032c45c1b68c6ad5747cf1a01be8 100644 (file)
--- 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 032046063ab9d3451d441f4182c0b76807c95aff..ca15ddea721f564357213840d7b1ac3488ee2fa7 100644 (file)
--- 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

diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index b55fb11d0712b53ab83e65d8bf3a8641bc033baf..07f821e87f48fdef225e054528ad94e84c8c09ae 100644 (file)
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -29,7 +29,7 @@ $english = array(
        /**
         * The wire river
         */
-       'thewire:river:create' => "posted to the wire",
+       'river:create:object:thewire' => "%s posted to the wire",
 
        /**
         * Wire widget

diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index d4dac38eee865596e9be85c3a5c5e29a4ee4c4da..2e9cfd83bd6f83cc8e7a2eec19404f31193bbc4e 100644 (file)
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -7,18 +7,8 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = thewire_filter($excerpt);
 
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('thewire:river:create');
-
-echo " $link";
-
-if ($excerpt) {
-       echo '<div class="elgg-river-content">';
-       echo $excerpt;
-       echo '</div>';
-}
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+       'message' => $excerpt,
+       'summary' => false,
+));
\ No newline at end of file

diff --git a/vendors/markdown/License.text b/vendors/markdown/License.text
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vendors/markdown/PHP Markdown Extra Readme.text b/vendors/markdown/PHP Markdown Extra Readme.text
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vendors/markdown/markdown.php b/vendors/markdown/markdown.php
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
index aabb6a9c64b96b78412da810d887034cbe4c3b11..d3db68e41bc86972f7901c72327484c34806c11f 100644 (file)
--- a/views/default/river/annotation/generic_comment/create.php
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -5,26 +5,7 @@
 $object = $vars['item']->getObjectEntity();
 $comment = $vars['item']->getAnnotation();
 
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-       $title = elgg_echo('untitled');
-}
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:generic_comment', array($type_string, $object_link));
-
-if ($comment) {
-       $excerpt = elgg_get_excerpt($comment->value);
-       echo '<div class="elgg-river-content">';
-       echo $excerpt;
-       echo '</div>';
-}
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+       'message' => elgg_get_excerpt($comment->value),
+));

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index f9ecbc03c5c5a18396749b4a3d82f32feee391cd..a76cae9097746878738d6f4bba20b5dd8868f20c 100644 (file)
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -6,28 +6,49 @@
  */
 
 $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>";
+}
 
-// body
-$body = elgg_view($item->getView(), array('item' => $item));
+$attachments = elgg_extract('attachments', $vars, false);
+if ($attachments !== false) {
+       $attachments = "<div class=\"elgg-river-attachments\">$attachments</div>";
+}
 
-// footer
 $footer = elgg_view('river/elements/footer', $vars);
 
-echo elgg_view('page/components/module', array(
-       'header' => $header,
-       'body' => $body,
-       'footer' => $footer,
-       'class' => 'mbn',
-));
\ No newline at end of file
+$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 <<<RIVER
+$menu
+<div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div>
+$message
+$attachments
+$footer
+RIVER;

diff --git a/views/default/river/elements/summary.php b/views/default/river/elements/summary.php
new file mode 100644 (file)
index 0000000..eee8754
--- /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

diff --git a/views/default/river/item.php b/views/default/river/item.php
index bf7c80b03070008c529153d0796a1a222ac4c684..94622e2727ebc47dc662c9b8d925f3d0afcb65a4 100644 (file)
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -7,10 +7,8 @@
 
 $item = $vars['item'];
 
-$vars = array(
-       'image' => elgg_view('river/elements/image', array('item' => $item)),
-       'body' => elgg_view('river/elements/body', array('item' => $item)),
+echo elgg_view('page/components/image_block', array(
+       'image' => elgg_view('river/elements/image', $vars),
+       'body' => elgg_view('river/elements/body', $vars),
        'class' => 'elgg-river-item',
-);
-
-echo elgg_view('page/components/image_block', $vars);
+));

diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index 14dab44517208e6a41f138fc47e269ba38bd3642..f3f4a9b14758620e420a3463fb8d1ae7e1d20122 100644 (file)
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -5,18 +5,10 @@
 $subject = $vars['item']->getSubjectEntity();
 $object = $vars['item']->getObjectEntity();
 
-$params = array(
-       'href' => $object->getURL(),
-       'text' => $object->name,
-);
-$object_link = elgg_view('output/url', $params);
 $subject_icon = elgg_view_entity_icon($subject, 'tiny');
 $object_icon = elgg_view_entity_icon($object, 'tiny');
 
-echo elgg_echo("friends:river:add", array($object_link));
-
-echo '<div class="elgg-river-content clearfix">';
-echo $subject_icon;
-echo elgg_view_icon('arrow-right', true);
-echo $object_icon;
-echo '</div>';
+echo elgg_view('river/item', array(
+       'item' => $vars['item'],
+       'attachments' => $subject_icon . elgg_view_icon('arrow-right', true) . $object_icon,
+));