aboutsummaryrefslogtreecommitdiff
path: root/mod/groups/views
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 14:10:51 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 14:10:51 +0000
commit538a22b85384008533aeef2ac356ff668766e0cb (patch)
tree0070a18c9d09241a15df94fcbeeeda16feed4138 /mod/groups/views
parent90cb880ec6b629376df97c89bc4a0b3e2db32c8e (diff)
downloadelgg-538a22b85384008533aeef2ac356ff668766e0cb.tar.gz
elgg-538a22b85384008533aeef2ac356ff668766e0cb.tar.bz2
Riverdashboard refreshed, and updated display of comments and likes (the loading of these needs to be moved to ajax callbacks)
git-svn-id: http://code.elgg.org/elgg/trunk@5643 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/views')
-rw-r--r--mod/groups/views/default/river/forum/create.php7
-rw-r--r--mod/groups/views/default/river/forum/topic/create.php7
2 files changed, 8 insertions, 6 deletions
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index fb6cd707c..e51d9fe72 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -2,7 +2,7 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$object = get_entity($vars['item']->object_guid);
- //$url = $object->getURL();
+ $object_url = $object->getURL();
$forumtopic = $object->guid;
$group_guid = $object->container_guid;
//grab the annotation, if one exists
@@ -12,12 +12,13 @@
$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
- $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a>";
+ $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+ $string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "<div class=\"river_content_display\">";
if($comment){
$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
if(strlen($contents) > 200)
- $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+ $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "&hellip;";
else
$string .= $contents;
}
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index f4c4aadfd..7b06cd275 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -2,7 +2,7 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$object = get_entity($vars['item']->object_guid);
- //$url = $object->getURL();
+ $object_url = $object->getURL();
$forumtopic = $object->guid;
$group_guid = $object->container_guid;
$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
@@ -13,10 +13,11 @@
$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
- $string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
+ $string .= "<a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+ $string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "<div class=\"river_content_display\">";
if(strlen($contents) > 200) {
- $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+ $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "&hellip;";
}else{
$string .= $contents;
}