aboutsummaryrefslogtreecommitdiff
path: root/mod/groups
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-08 12:10:14 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-08 12:10:14 +0000
commit35d3906d3230d747fbc64626c1420809ba4a0e79 (patch)
treed97ed92eeda1b941a33e0bce896357204aa1a6db /mod/groups
parent7a6b83050178b2f57fe6635192b8d76dab76ccaf (diff)
downloadelgg-35d3906d3230d747fbc64626c1420809ba4a0e79.tar.gz
elgg-35d3906d3230d747fbc64626c1420809ba4a0e79.tar.bz2
Moved all river entry metadata inside span (pushed onto new line) and added relevant css
git-svn-id: http://code.elgg.org/elgg/trunk@6660 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups')
-rw-r--r--mod/groups/views/default/river/forum/create.php3
-rw-r--r--mod/groups/views/default/river/forum/topic/create.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 4906fc869..e99c77a4e 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -16,8 +16,9 @@
$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> <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_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
+ $string .= "</span>";
$string .= "<div class=\"river_content_display\">";
$string .= elgg_make_excerpt($contents, 200);
$string .= "</div>";
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index fb2a3556d..b44922022 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -16,11 +16,12 @@
$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
- $string .= " <span class='entity_subtext'>". friendly_time($object->time_created) ."</span>";
+ $string .= " <span class='entity_subtext'>". friendly_time($object->time_created);
if (isloggedin() && $object->status != "closed") {
$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>";
$string .= "<div class=\"river_content_display\">";
$string .= elgg_make_excerpt($contents, 200);
$string .= "</div>";