7 files changed, 171 insertions, 80 deletions

diff --git a/mod/groups/views/default/forms/discussion/reply/save.php b/mod/groups/views/default/forms/discussion/reply/save.php
new file mode 100644
index 000000000..083fefb78
--- /dev/null
+++ b/mod/groups/views/default/forms/discussion/reply/save.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Discussion topic reply form body
+ *
+ * @uses $vars['entity'] A discussion topic object
+ * @uses $vars['inline'] Display a shortened form?
+ */
+
+if (isset($vars['entity']) && elgg_is_logged_in()) {
+	echo elgg_view('input/hidden', array(
+		'name' => 'entity_guid',
+		'value' => $vars['entity']->getGUID(),
+	));
+
+	$inline = elgg_extract('inline', $vars, false);
+
+	$annotation = elgg_extract('annotation', $vars);
+	
+	$value = '';
+
+	if ($annotation) {
+		$value = $annotation->value;
+		echo elgg_view('input/hidden', array(
+			'name' => 'annotation_id',
+			'value' => $annotation->id
+		));
+	}
+
+	if ($inline) {
+		echo elgg_view('input/text', array('name' => 'group_topic_post', 'value' => $value));
+		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
+	} else {
+?>
+	<div>
+		<label>
+		<?php
+			if ($annotation) {
+				echo elgg_echo('edit');
+			} else {
+				echo elgg_echo("reply");
+			}
+		?>
+		</label>
+		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post', 'value' => $value)); ?>
+	</div>
+	<div class="elgg-foot">
+<?php
+	if ($annotation) {
+		echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+	} else {
+		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
+	}
+?>
+	</div>
+<?php
+	}
+}
diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php
index 5d50d5c91..a6582ede7 100644
--- a/mod/groups/views/default/forms/discussion/save.php
+++ b/mod/groups/views/default/forms/discussion/save.php
@@ -42,7 +42,7 @@ $guid = elgg_extract('guid', $vars, null);
 	<label><?php echo elgg_echo('access'); ?></label><br />
 	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
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 4c380718a..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-cancel",
-	'value' => elgg_echo('groups:delete'),
-	'onclick' => "javascript:return confirm('$warning')",
-));
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index f9ef86296..e2dc5455a 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -5,12 +5,9 @@
  * @package ElggGroups
  */
 
-// new groups default to open membership
-if (isset($vars['entity'])) {
-	$membership = $vars['entity']->membership;
-} else {
-	$membership = ACCESS_PUBLIC;
-}
+// only extract these elements.
+$name = $membership = $vis = $entity = null;
+extract($vars, EXTR_IF_EXISTS);
 
 ?>
 <div>
@@ -21,7 +18,7 @@ if (isset($vars['entity'])) {
 	<label><?php echo elgg_echo("groups:name"); ?></label><br />
 	<?php echo elgg_view("input/text", array(
 		'name' => 'name',
-		'value' => $vars['entity']->name,
+		'value' => $name
 	));
 	?>
 </div>
@@ -39,7 +36,7 @@ if ($group_profile_fields > 0) {
 		echo "</label>$line_break";
 		echo elgg_view("input/{$valtype}", array(
 			'name' => $shortname,
-			'value' => $vars['entity']->$shortname,
+			'value' => elgg_extract($shortname, $vars)
 		));
 		echo '</div>';
 	}
@@ -49,10 +46,10 @@ if ($group_profile_fields > 0) {
 <div>
 	<label>
 		<?php echo elgg_echo('groups:membership'); ?><br />
-		<?php echo elgg_view('input/access', array(
+		<?php echo elgg_view('input/dropdown', array(
 			'name' => 'membership',
 			'value' => $membership,
-			'options' => array(
+			'options_values' => array(
 				ACCESS_PRIVATE => elgg_echo('groups:access:private'),
 				ACCESS_PUBLIC => elgg_echo('groups:access:public')
 			)
@@ -64,23 +61,11 @@ if ($group_profile_fields > 0) {
 <?php
 
 if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
-	$this_owner = $vars['entity']->owner_guid;
-	if (!$this_owner) {
-		$this_owner = elgg_get_logged_in_user_guid();
-	}
-	$access = array(
-		ACCESS_FRIENDS => elgg_echo("access:friends:label"),
+	$access_options = array(
+		ACCESS_PRIVATE => elgg_echo('groups:access:group'),
 		ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"),
 		ACCESS_PUBLIC => elgg_echo("PUBLIC")
 	);
-	$collections = get_user_access_collections($vars['entity']->guid);
-	if (is_array($collections)) {
-		foreach ($collections as $c) {
-			$access[$c->id] = $c->name;
-		}
-	}
-
-	$current_access = $vars['entity']->access_id ? $vars['entity']->access_id : ACCESS_PUBLIC;
 ?>
 
 <div>
@@ -88,8 +73,8 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
 			<?php echo elgg_echo('groups:visibility'); ?><br />
 			<?php echo elgg_view('input/access', array(
 				'name' => 'vis',
-				'value' =>  $current_access,
-				'options' => $access,
+				'value' =>  $vis,
+				'options_values' => $access_options,
 			));
 			?>
 	</label>
@@ -98,17 +83,57 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
 <?php 	
 }
 
+if (isset($vars['entity'])) {
+	$entity     = $vars['entity'];
+	$owner_guid = $vars['entity']->owner_guid;
+} else {
+	$entity = false;
+}
+
+if ($entity && ($owner_guid == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())) {
+	$members = array();
+
+	$options = array(
+		'relationship' => 'member',
+		'relationship_guid' => $vars['entity']->getGUID(),
+		'inverse_relationship' => true,
+		'type' => 'user',
+		'limit' => 0,
+	);
+
+	$batch = new ElggBatch('elgg_get_entities_from_relationship', $options);
+	foreach ($batch as $member) {
+		$members[$member->guid] = "$member->name (@$member->username)";
+	}
+?>
+
+<div>
+	<label>
+			<?php echo elgg_echo('groups:owner'); ?><br />
+			<?php echo elgg_view('input/dropdown', array(
+				'name' => 'owner_guid',
+				'value' =>  $owner_guid,
+				'options_values' => $members,
+				'class' => 'groups-owner-input',
+			));
+			?>
+	</label>
+	<?php
+	if ($owner_guid == elgg_get_logged_in_user_guid()) {
+		echo '<span class="elgg-text-help">' . elgg_echo('groups:owner:warning') . '</span>';
+	}
+	?>
+</div>
+
+<?php 	
+}
+
 $tools = elgg_get_config('group_tool_options');
 if ($tools) {
 	usort($tools, create_function('$a,$b', 'return strcmp($a->label,$b->label);'));
 	foreach ($tools as $group_option) {
 		$group_option_toggle_name = $group_option->name . "_enable";
-		if ($group_option->default_on) {
-			$group_option_default_value = 'yes';
-		} else {
-			$group_option_default_value = 'no';
-		}
-		$value = $vars['entity']->$group_option_toggle_name ? $vars['entity']->$group_option_toggle_name : $group_option_default_value;
+		$value = elgg_extract($group_option_toggle_name, $vars);
 ?>	
 <div>
 	<label>
@@ -128,16 +153,26 @@ if ($tools) {
 	}
 }
 ?>
-<div class="bta">
+<div class="elgg-foot">
 <?php
 
-if (isset($vars['entity'])) {
+if ($entity) {
 	echo elgg_view('input/hidden', array(
 		'name' => 'group_guid',
-		'value' => $vars['entity']->getGUID(),
+		'value' => $entity->getGUID(),
 	));
 }
 
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+
+if ($entity) {
+	$delete_url = 'action/groups/delete?guid=' . $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/find.php b/mod/groups/views/default/forms/groups/find.php
new file mode 100644
index 000000000..ddf639b74
--- /dev/null
+++ b/mod/groups/views/default/forms/groups/find.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Group tag-based search form body
+ */
+
+$tag_string = elgg_echo('groups:search:tags');
+
+$params = array(
+	'name' => 'tag',
+	'class' => 'elgg-input-search mbm',
+	'value' => $tag_string,
+	'onclick' => "if (this.value=='$tag_string') { this.value='' }",
+);
+echo elgg_view('input/text', $params);
+
+echo elgg_view('input/submit', array('value' => elgg_echo('search:go')));
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 73eadb024..ef3131782 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -1,29 +1,22 @@
 <?php
-	/**
-	 * Elgg groups plugin
-	 *
-	 * @package ElggGroups
-	 */
+/**
+ * Elgg groups invite form
+ *
+ * @package ElggGroups
+ */
 
-	$group = $vars['entity'];
-	$owner = get_entity($vars['entity']->owner_guid);
-	$forward_url = $group->getURL();
-	$friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
+$group = $vars['entity'];
+$owner = $group->getOwnerEntity();
+$forward_url = $group->getURL();
+$friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
 
 if ($friends) {
-?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin-top">
-
-<?php
-	echo elgg_view('input/securitytoken');
-
-	echo elgg_view('core/friends/picker',array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all'));
-?>
-	<input type="hidden" name="forward_url" value="<?php echo $forward_url; ?>" />
-	<input type="hidden" name="group_guid" value="<?php echo $group->guid; ?>" />
-	<input type="submit" value="<?php echo elgg_echo('invite'); ?>" />
-</form>
-<?php
+	echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all'));
+	echo '<div class="elgg-foot">';
+	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/forms/groups/search.php b/mod/groups/views/default/forms/groups/search.php
index 8912b245c..850b6088e 100644
--- a/mod/groups/views/default/forms/groups/search.php
+++ b/mod/groups/views/default/forms/groups/search.php
@@ -1,13 +1,20 @@
 <?php
-
-$tag_string = elgg_echo('groups:search:tags');
+/**
+ * Group search form
+ *
+ * @uses $vars['entity'] ElggGroup
+ */
 
 $params = array(
-	'name' => 'tag',
-	'class' => 'search-input',
+	'name' => 'q',
+	'class' => 'elgg-input-search mbm',
 	'value' => $tag_string,
-	'onclick' => "if (this.value=='$tag_string') { this.value='' }",
 );
 echo elgg_view('input/text', $params);
 
+echo elgg_view('input/hidden', array(
+	'name' => 'container_guid',
+	'value' => $vars['entity']->getGUID(),
+));
+
 echo elgg_view('input/submit', array('value' => elgg_echo('search:go')));