aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Tosh <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-27 11:17:39 +0000
committerDave Tosh <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-27 11:17:39 +0000
commita7fd31dd9ede22570734d35586c1cc0848dc0219 (patch)
treed4c8e64704ac6b894c51a2c4a99564b6dc826b97
parent5a619d500ffe1205d6b4612b2e4535ee6bb956b2 (diff)
downloadelgg-a7fd31dd9ede22570734d35586c1cc0848dc0219.tar.gz
elgg-a7fd31dd9ede22570734d35586c1cc0848dc0219.tar.bz2
videolist activity view tweaked
git-svn-id: http://code.elgg.org@6247 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php1
-rw-r--r--views/default/river/object/videolist/create.php8
2 files changed, 7 insertions, 2 deletions
diff --git a/languages/en.php b/languages/en.php
index 7b438d9d9..d8c076556 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -23,6 +23,7 @@ $english = array(
"videolist:search" => "All Site videos",
'videolist:friends' => "Friends' videos",
'videolist:edit' => "Edit video",
+ 'videolist:ingroup' => "in the group",
"videolist:title_videourl" => 'Enter Video Url',
"videolist:submit" => 'Submit',
"videolist:videoTitle" => "Title",
diff --git a/views/default/river/object/videolist/create.php b/views/default/river/object/videolist/create.php
index 9ede85096..ac849a67b 100644
--- a/views/default/river/object/videolist/create.php
+++ b/views/default/river/object/videolist/create.php
@@ -3,7 +3,7 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$object = get_entity($vars['item']->object_guid);
$thumbnail = $object->thumbnail;
-//$url = $object->getURL();
+$is_group = get_entity($object->container_guid);
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$title = $object->title;
@@ -13,7 +13,11 @@ if(!$title) {
}
$string = sprintf(elgg_echo("videolist:river:created"),$url) . " ";
-$string .= elgg_echo("videolist:river:item") . " titled <a href=\"" . $object->getURL() . "\">" . $title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>";
+$string .= elgg_echo("videolist:river:item") . " titled <a href=\"" . $object->getURL() . "\">" . $title . "</a>";
+if($is_group){
+ $string .= " " . elgg_echo('videolist:ingroup') . " " . $is_group->name;
+}
+$string .= "<span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>";
if (isloggedin()){
$string .= "<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));