diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
| commit | a3a03a721f62bcf1426a475a543b0b1fcd322bcf (patch) | |
| tree | 4e6349bcf673d21e7513381b9acd1f832654fc02 /mod/blog | |
| parent | 344e47862b1f39eca19e39a000f97f799cc87a12 (diff) | |
| parent | cf85a49c7e74133feaec7d52d8f289d22b59a56c (diff) | |
| download | elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.gz elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.bz2 | |
Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow-3404-river-revamp
Conflicts:
languages/en.php
Diffstat (limited to 'mod/blog')
| -rw-r--r-- | mod/blog/languages/en.php | 5 | ||||
| -rw-r--r-- | mod/blog/views/default/river/object/blog/create.php | 30 |
2 files changed, 7 insertions, 28 deletions
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php index b626085d7..460c407d9 100644 --- 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 bd2405d42..613cbb165 100644 --- 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 |