aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-13 12:35:19 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-13 12:35:19 +0000
commit5af791d152567f07b68c2006cfc74c71fc4d3058 (patch)
tree4d790c0165d2d9e6f47daa2d074c01b57e6d1d62
parentd611e9c962ce825eb7f4600f27f74c3dc477000f (diff)
downloadelgg-5af791d152567f07b68c2006cfc74c71fc4d3058.tar.gz
elgg-5af791d152567f07b68c2006cfc74c71fc4d3058.tar.bz2
Refs #2226 updated blog plugin to use new river view
git-svn-id: http://code.elgg.org/elgg/trunk@7611 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/blog/languages/en.php2
-rw-r--r--mod/blog/views/default/river/object/blog/create.php29
2 files changed, 10 insertions, 21 deletions
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index 15708f30b..f3d93f5e3 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -52,7 +52,7 @@ $english = array(
'blog:error:revision_not_found' => 'Cannot find this revision.',
// river
- 'blog:river:create' => '%s wrote a new blog post',
+ 'blog:river:create' => 'published a blog post',
);
add_translation('en', $english);
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index 2b52429a6..38ee177ed 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -3,27 +3,16 @@
* Blog river view.
*/
-$performed_by = get_entity($vars['item']->subject_guid);
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$contents = strip_tags($object->excerpt);
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->excerpt);
+$excerpt = elgg_get_excerpt($excerpt);
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$title = elgg_echo('blog:river:create', array($url));
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
+echo elgg_echo('blog:river:create');
-if (isloggedin()) {
- $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
- $string .= elgg_view('likes/forms/link', array('entity' => $object));
-}
-$string .= "</span>";
+echo " <a href=\"{$object->getURL()}\">{$object->title}</a>";
-$string .= '<div class="river_content_display">';
-$string .= '<div class="river_object_blog_create"></div>';
-if (strlen($contents) > 200) {
- $string .= substr($contents, 0, strpos($contents, ' ', 200)) . '&hellip;';
-} else {
- $string .= $contents;
+if ($excerpt) {
+ echo '<div class="elgg-river-excerpt">';
+ echo $excerpt;
+ echo '</div>';
}
-$string .= '</div>';
-echo $string; \ No newline at end of file