From de382a941d30b9f06e8fe440dc40549305badc84 Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Feb 2009 17:49:42 +0000
Subject: new group discussion layout

git-svn-id: https://code.elgg.org/elgg/trunk@2880 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/object/groupforumtopic.php       | 114 +++++++++++----------
 1 file changed, 62 insertions(+), 52 deletions(-)

(limited to 'mod/groups/views/default/object')

diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 65eca23fd..b58a41052 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -1,54 +1,64 @@
-<?php
-
-	/**
-	 * Elgg Groups latest discussion listing
-	 * 
-	 * @package ElggGroups
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.com/
-	 */
-	 
-    //get the required variables
-    $title = $vars['entity']->title;
-    $description = autop($vars['entity']->description);
-    $group =  get_entity($vars['entity']->container_guid);
+<?php
+
+	/**
+	 * Elgg Groups latest discussion listing
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.com/
+	 */
+	 
+    //get the required variables
+    $title = $vars['entity']->title;
+    $description = autop($vars['entity']->description);
+    $topic_owner = get_user($vars['entity']->owner_guid);
+    $group = get_entity($vars['entity']->container_guid);
     $forum_created = friendly_time($vars['entity']->time_created);
-    //if (isloggedin()) {
-	    $counter = $vars['entity']->countAnnotations("group_topic_post");
-	    $last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc");
-    
-    //}
-
-    //get the time and user
-    if ($last_post) {
-		foreach($last_post as $last)
-		{
-			$last_time = $last->time_created;
-			$last_user = $last->owner_guid;
-		}
-	}
-
-	$u = get_user($last_user);
-	
-    $info = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) .  "<br /><span class=\"timestamp\">";
-    if ($last_time) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>");
-    //if ($u = get_user($last_user)) {
-    //	$info .= "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>";
-    //}
-    $info .= '</span></p>';
-	//get the group avatar
-	$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
-    //get the group and topic title
-    if ($group instanceof ElggGroup)
-    	$info .= "<p>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">{$group->name}</a></p>";
-    
-	$info .= "<p>" . elgg_echo('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);
-		
+    $counter = $vars['entity']->countAnnotations("group_topic_post");
+	$last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc");
+ 
+    //get the time and user
+    if ($last_post) {
+		foreach($last_post as $last)
+		{
+			$last_time = $last->time_created;
+			$last_user = $last->owner_guid;
+		}
+	}
+
+	$u = get_user($last_user);
+	
+	//select the correct output depending on where you are
+	if(get_context() == "search"){
+	
+	    $info = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) .  "<br /><span class=\"timestamp\">";
+	    if ($last_time) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), "<br />by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a>");
+	    $info .= '</span></p>';
+		//get the group avatar
+		$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
+	    //get the group and topic title
+	    if ($group instanceof ElggGroup)
+	    	$info .= "<p>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">{$group->name}</a></p>";
+	    
+		$info .= "<p>" . elgg_echo('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;
+		
+	}else{
+		
+		$info = "<p class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span></p>";
+	    //get the user avatar
+		$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'small'));
+	    $info .= "<p>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+		if ($last_time) $info.= "<p>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->username . "</a></p>";
+	    
+		$info .= $description;
+		
+	}
+		
+		//display
+		echo elgg_view_listing($icon, $info);
+		
 ?>
\ No newline at end of file
-- 
cgit v1.2.3