2 files changed, 84 insertions, 26 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 418a7532f..a6582ede7 100644
--- a/mod/groups/views/default/forms/discussion/save.php
+++ b/mod/groups/views/default/forms/discussion/save.php
@@ -4,53 +4,54 @@
  * 
  */
 
-$title = elgg_get_array_value('title', $vars, '');
-$desc = elgg_get_array_value('description', $vars, '');
-$status = elgg_get_array_value('status', $vars, '');
-$tags = elgg_get_array_value('tags', $vars, '');
-$access_id = elgg_get_array_value('access_id', $vars, ACCESS_DEFAULT);
-$container_guid = elgg_get_array_value('container_guid', $vars);
-$guid = elgg_get_array_value('guid', $vars, null);
+$title = elgg_extract('title', $vars, '');
+$desc = elgg_extract('description', $vars, '');
+$status = elgg_extract('status', $vars, '');
+$tags = elgg_extract('tags', $vars, '');
+$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
+$container_guid = elgg_extract('container_guid', $vars);
+$guid = elgg_extract('guid', $vars, null);
 
 ?>
-<p>
+<div>
 	<label><?php echo elgg_echo('title'); ?></label><br />
-	<?php echo elgg_view('input/text', array('internalname' => 'title', 'value' => $title)); ?>
-</p>
-<p>
+	<?php echo elgg_view('input/text', array('name' => 'title', 'value' => $title)); ?>
+</div>
+<div>
 	<label><?php echo elgg_echo('groups:topicmessage'); ?></label>
-	<?php echo elgg_view('input/longtext', array('internalname' => 'description', 'value' => $desc)); ?>
-</p>
-<p>
+	<?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $desc)); ?>
+</div>
+<div>
 	<label><?php echo elgg_echo('tags'); ?></label>
-	<?php echo elgg_view('input/tags', array('internalname' => 'tags', 'value' => $tags)); ?>
-</p>
-<p>
+	<?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags)); ?>
+</div>
+<div>
     <label><?php echo elgg_echo("groups:topicstatus"); ?></label><br />
 	<?php
 		echo elgg_view('input/dropdown', array(
-			'internalname' => 'status',
+			'name' => 'status',
 			'value' => $status,
 			'options_values' => array(
 				'open' => elgg_echo('groups:topicopen'),
 				'closed' => elgg_echo('groups:topicclosed'),
 			),
 		));
-	?>	
-<p>
+	?>
+</div>
+<div>
 	<label><?php echo elgg_echo('access'); ?></label><br />
-	<?php echo elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); ?>
-</p>
-<p>
+	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
+</div>
+<div class="elgg-foot">
 <?php
 
-echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid));
+echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
 
 if ($guid) {
-	echo elgg_view('input/hidden', array('internalname' => 'topic_guid', 'value' => $guid));
+	echo elgg_view('input/hidden', array('name' => 'topic_guid', 'value' => $guid));
 }
 
 echo elgg_view('input/submit', array('value' => elgg_echo("save")));
 
 ?>
-</p>
+</div>