From 613748b75a9cd1f1b1939ab05c22e63407237984 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 16:22:19 +0000
Subject: Merged [6600],[6601],[6605],[6606],[6607],[6608],[6611] from 1.7
 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6843 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/views/default/object/groupforumtopic.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 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 9ebf81642..8c95dd594 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -25,7 +25,7 @@ if ($last_post) {
 $u = get_user($last_user);
 
 //select the correct output depending on where you are
-if(get_context() == "search"){
+if (get_context() == "search") {
 	var_export($counter);
 	if($counter == 1){
     	$info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) .  "<br />";
@@ -42,7 +42,7 @@ if(get_context() == "search"){
     	$info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
     }
 
-}else{
+} else {
 	if($counter == 1){
 		$info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "</p>";
 	}else{
@@ -52,11 +52,20 @@ if(get_context() == "search"){
 
     if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
         	// display the delete link to those allowed to delete
-          	$info .= "<div class='delete_button'>" . elgg_view("output/confirmlink", array(
+          	$info .= "<div class='entity_metadata'>";
+			$info .= '<span class="entity_edit">' . elgg_view("output/url", array(
+               																'href' => $vars['url'] . "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
+               																'text' => elgg_echo('edit'),
+               															));
+			$info .= '</span>';
+			
+        	// display the delete link to those allowed to delete
+          	$info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array(
                																'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
-               																'text' => " ",
+               																'text' => elgg_echo('delete'),
                																'confirm' => elgg_echo('deleteconfirm'),
-               															)) . "</div>";
+               															));
+			$info .= "</span></div>";
 
    }
 
-- 
cgit v1.2.3