From 7237e3d6456cdcc297e362f290240949411353a6 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 10 Feb 2009 11:14:57 +0000
Subject: Closes #752: Delete move to edit, making it less fatal. Probably
 needs skinning.

git-svn-id: https://code.elgg.org/elgg/trunk@2700 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/start.php                           |  2 +-
 mod/groups/views/default/forms/groups/edit.php | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'mod/groups')

diff --git a/mod/groups/start.php b/mod/groups/start.php
index ee4c3d319..99afa4203 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -185,7 +185,7 @@
 				if (isloggedin()) {
 					if ($page_owner->canEdit()) {
 						add_submenu_item(elgg_echo('groups:edit'),$CONFIG->wwwroot . "mod/groups/edit.php?group_guid=" . $page_owner->getGUID(), '1groupsactions');
-						add_submenu_item(elgg_echo('groups:delete'),$CONFIG->wwwroot . "action/groups/delete?group_guid=" . $page_owner->getGUID(), '1groupsactions');
+						//add_submenu_item(elgg_echo('groups:delete'),$CONFIG->wwwroot . "action/groups/delete?group_guid=" . $page_owner->getGUID(), '1groupsactions');
 						add_submenu_item(elgg_echo('groups:invite'),$CONFIG->wwwroot . "mod/groups/invite.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
 					}
 					if ($page_owner->isMember($_SESSION['user'])) {
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index a570a7a86..4bec70b04 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -8,6 +8,7 @@
 	 * @copyright Curverider Ltd 2008-2009
 	 * @link http://elgg.com/
 	 */
+
 ?>
 <form action="<?php echo $vars['url']; ?>action/groups/edit" enctype="multipart/form-data" method="post">
 
@@ -114,6 +115,20 @@
 		?>
 		<input type="hidden" name="user_guid" value="<?php echo page_owner_entity()->guid; ?>" />
 		<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
+		
 	</p>
 
-</form>
\ No newline at end of file
+</form>
+
+<div id="delete_group_option">
+	<form action="<?php echo $vars['url'] . "action/groups/delete"; ?>">
+		<?php
+			if ($vars['entity'])
+			{ 
+			?>
+			<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
+			<input type="submit" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" /><?php 
+			}
+		?>
+	</form>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3