4 files changed, 13 insertions, 24 deletions
diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php
deleted file mode 100644
index 28c2eb9bf..000000000
--- a/mod/groups/views/default/forms/groups/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Group delete form body
- */
-
-$warning = elgg_echo("groups:deletewarning");
-
-echo elgg_view('input/hidden', array(
-	'name' => 'group_guid',
-	'value' => $vars['entity']->getGUID(),
-));
-
-echo elgg_view('input/submit', array(
-	'class' => "elgg-button elgg-button-delete right",
-	'value' => elgg_echo('groups:delete'),
-	'onclick' => "return confirm('$warning');",
-));
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 1a4e95513..b67134c63 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -126,7 +126,7 @@ if ($tools) {
 	}
 }
 ?>
-<div class="elgg-divide-top">
+<div class="elgg-form-footer-alt">
 <?php
 
 if (isset($vars['entity'])) {
@@ -137,5 +137,15 @@ if (isset($vars['entity'])) {
 }
 
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+
+if (isset($vars['entity'])) {
+	$delete_url = 'action/groups/delete?guid=' . $vars['entity']->getGUID();
+	echo elgg_view('output/confirmlink', array(
+		'text' => elgg_echo('groups:delete'),
+		'href' => $delete_url,
+		'confirm' => elgg_echo('groups:deletewarning'),
+		'class' => 'elgg-button elgg-button-delete float-alt',
+	));
+}
 ?>
 </div>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index a49bbe2fb..83139c2ee 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,9 +12,11 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
 
 if ($friends) {
 	echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all'));
+	echo '<div class="elgg-form-footer">';
 	echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url));
 	echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('invite')));
+	echo '</div>';
 } else {
 	echo elgg_echo('groups:nofriendsatall');
 }
 \ No newline at end of file
diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 2434bd14f..5076cc49a 100644
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -10,9 +10,3 @@ $entity = elgg_extract('entity', $vars, null);
 $form_vars = array('enctype' => 'multipart/form-data');
 $body_vars = array('entity' => $entity);
 echo elgg_view_form('groups/edit', $form_vars, $body_vars);
-
-if ($entity) {
-	echo '<div class="delete_group">';
-	echo elgg_view_form('groups/delete', array(), array('entity' => $entity));
-	echo '</div>';
-}