Merge branch 'master' of github.com:brettp/Elgg

4 files changed, 40 insertions, 12 deletions

diff --git a/mod/groups/views/default/forms/discussion/reply/save.php b/mod/groups/views/default/forms/discussion/reply/save.php
index be258b8fe..083fefb78 100644
--- a/mod/groups/views/default/forms/discussion/reply/save.php
+++ b/mod/groups/views/default/forms/discussion/reply/save.php
@@ -1,29 +1,57 @@
 <?php
 /**
- * Discussion topic reply form bofy
+ * 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'));
+		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 echo elgg_echo("reply"); ?></label>
-		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post')); ?>
+		<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')));
 	}
-	echo elgg_view('input/hidden', array(
-		'name' => 'entity_guid',
-		'value' => $vars['entity']->getGUID(),
-	));
+?>
+	</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/edit.php b/mod/groups/views/default/forms/groups/edit.php
index b67134c63..26436ef01 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-form-footer-alt">
+<div class="elgg-foot">
 <?php
 
 if (isset($vars['entity'])) {
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 83139c2ee..ef3131782 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,7 +12,7 @@ $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 '<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')));