From 409331a459355fb827aa33acf3275f3d618a2510 Mon Sep 17 00:00:00 2001
From: pete
Date: Wed, 10 Mar 2010 17:13:37 +0000
Subject: Updated Groups to the new interface. Some view clean-up &
simplification done.
git-svn-id: http://code.elgg.org/elgg/trunk@5348 36083f99-b078-4883-b0ff-0f9b5a30f544
---
.../views/default/object/groupforumtopic.php | 54 ++++++++++------------
1 file changed, 24 insertions(+), 30 deletions(-)
(limited to 'mod/groups/views/default/object/groupforumtopic.php')
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 1dd57c859..5fb1dad0b 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -21,8 +21,7 @@
//get the time and user
if ($last_post) {
- foreach($last_post as $last)
- {
+ foreach($last_post as $last) {
$last_time = $last->time_created;
$last_user = $last->owner_guid;
}
@@ -33,42 +32,37 @@
//select the correct output depending on where you are
if(get_context() == "search"){
- $info = "" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "
";
+ $info = "" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "
";
if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " getURL() . "\">" . $u->name . "");
- $info .= '
';
+ $info .= '
';
//get the group avatar
- $icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
+ $icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'tiny'));
//get the group and topic title
- if ($group instanceof ElggGroup)
- $info .= "" . elgg_echo('group') . ": getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."
";
-
- $info .= "" . elgg_echo('topic') . ": guid}&group_guid={$group->guid}\">{$title}
";
- //get the forum description
- //$info .= $description;
+ if ($group instanceof ElggGroup) {
+ $info .= "" . elgg_echo('group') . ": getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."
";
+ }
+ $info .= "" . elgg_echo('topic') . ": guid}&group_guid={$group->guid}\">{$title}
";
}else{
- $info = "" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "";
- if (($last_time) && ($u)) $info.= "
" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by getURL() . "\">" . $u->name . "";
+ $info = "" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "
";
+ $info .= "" . elgg_echo('groups:started') . " " . $topic_owner->name . ": guid}&group_guid={$group->guid}\">{$title}
";
- if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
-
- // display the delete link to those allowed to delete
- $info .= "
" . elgg_view("output/confirmlink", array(
- 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
- 'text' => " ",
- 'confirm' => elgg_echo('deleteconfirm'),
- )) . "";
-
- }
-
- $info .= "";
-
+ if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+ // display the delete link to those allowed to delete
+ $info .= "" . elgg_view("output/confirmlink", array(
+ 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
+ 'text' => " ",
+ 'confirm' => elgg_echo('deleteconfirm'),
+ )) . "
";
+
+ }
+
+ if (($last_time) && ($u)) {
+ $info.= "" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by getURL() . "\">" . $u->name . "
";
+ }
//get the user avatar
- $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'small'));
- $info .= "" . elgg_echo('groups:started') . " " . $topic_owner->name . ": guid}&group_guid={$group->guid}\">{$title}
";
- $info .= "";
-
+ $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
}
//display
--
cgit v1.2.3