1 files changed, 101 insertions, 40 deletions
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 597d5cec5..e6988d16e 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -1,40 +1,101 @@
-<?php
-
-	/**
-	 * Elgg Forum listing
-	 * 
-	 * @package ElggForums
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Dave Tosh <dave@elgg.com>
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.com/
-	 */
-	 
-    //get the required variables
-    $title = $vars['entity']->title;
-    $description = autop($vars['entity']->description);
-    $group =  get_entity($vars['entity']->container_guid);
-    $num_topics = $vars['entity']->countEntitiesFromRelationship("forum_topic");
-    $forum_created = friendly_time($vars['entity']->time_created);
-    // get the topic entities 
-    $entities = $vars['entity']->getEntitiesFromRelationship("forum_topic");
-    $counter = 0; 
-    foreach($entities as $ent){
-        //count the post annotations for each topic
-        $counter = $ent->countAnnotations("topic_post");
-    }
-	 
-    $info = "<p style=\"float:right;\">" . elgg_echo('created') . " " . $forum_created . ", " . elgg_echo('with') . " " . $num_topics . " " . elgg_echo('topics') . " " . elgg_echo('and') . " " . $counter . " " . elgg_echo('posts') . ".</p>";
-	//get the group avatar
-	$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'tiny'));
-    //get the group and topic title
-    $info .= "<p>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">{$group->name}</a></p>";
-    
-	$info .= "<p>" . elgg_echo('groups:topic') . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
-	//get the forum description
-	$info .= $description;
-	
-	//display
-	echo elgg_view_listing($icon, $info);
-		
-?>
-\ No newline at end of file
+<?php
+/**
+ * Forum topic entity view
+ *
+ * @package ElggGroups
+*/
+
+$full = elgg_extract('full_view', $vars, FALSE);
+$topic = elgg_extract('entity', $vars, FALSE);
+
+if (!$topic) {
+	return true;
+}
+
+$poster = $topic->getOwnerEntity();
+$group = $topic->getContainerEntity();
+$excerpt = elgg_get_excerpt($topic->description);
+
+$poster_icon = elgg_view_entity_icon($poster, 'tiny');
+$poster_link = elgg_view('output/url', array(
+	'href' => $poster->getURL(),
+	'text' => $poster->name,
+	'is_trusted' => true,
+));
+$poster_text = elgg_echo('groups:started', array($poster->name));
+
+$tags = elgg_view('output/tags', array('tags' => $topic->tags));
+$date = elgg_view_friendly_time($topic->time_created);
+
+$replies_link = '';
+$reply_text = '';
+$num_replies = elgg_get_annotations(array(
+	'annotation_name' => 'group_topic_post',
+	'guid' => $topic->getGUID(),
+	'count' => true,
+));
+if ($num_replies != 0) {
+	$last_reply = $topic->getAnnotations('group_topic_post', 1, 0, 'desc');
+	$poster = $last_reply[0]->getOwnerEntity();
+	$reply_time = elgg_view_friendly_time($last_reply[0]->time_created);
+	$reply_text = elgg_echo('groups:updated', array($poster->name, $reply_time));
+	
+	$replies_link = elgg_view('output/url', array(
+		'href' => $topic->getURL() . '#group-replies',
+		'text' => elgg_echo('group:replies') . " ($num_replies)",
+		'is_trusted' => true,
+	));
+}
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
+	'handler' => 'discussion',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+// do not show the metadata and controls in widget view
+if (elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if ($full) {
+	$subtitle = "$poster_text $date $replies_link";
+
+	$params = array(
+		'entity' => $topic,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+		'tags' => $tags,
+	);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
+
+	$info = elgg_view_image_block($poster_icon, $list_body);
+
+	$body = elgg_view('output/longtext', array(
+		'value' => $topic->description,
+		'class' => 'clearfix',
+	));
+
+	echo <<<HTML
+$info
+$body
+HTML;
+
+} else {
+	// brief view
+	$subtitle = "$poster_text $date $replies_link <span class=\"groups-latest-reply\">$reply_text</span>";
+
+	$params = array(
+		'entity' => $topic,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+		'tags' => $tags,
+		'content' => $excerpt,
+	);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
+
+	echo elgg_view_image_block($poster_icon, $list_body);
+}