2 files changed, 39 insertions, 15 deletions
diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index dd3a3e1cb..e0bcd55d6 100644
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -13,14 +13,11 @@ $group = $vars['entity'];
 
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pg/discussion/owner/$group->guid",
+	'href' => "discussion/owner/$group->guid",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('discussion:group') . '</h3>';
-
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -34,19 +31,18 @@ $content = elgg_list_entities($options);
 elgg_pop_context();
 
 if (!$content) {
-	$content = '<p>' . elgg_echo('grouptopic:notcreated') . '</p>';
+	$content = '<p>' . elgg_echo('discussion:none') . '</p>';
 }
 
 $new_link = elgg_view('output/url', array(
-	'href' => "pg/discussion/add/" . $group->getGUID(),
+	'href' => "discussion/add/" . $group->getGUID(),
 	'text' => elgg_echo('groups:addtopic'),
+	'is_trusted' => true,
 ));
-$content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-
-$params = array(
-	'header' => $header,
-	'body' => $content,
-	'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('discussion:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
+\ No newline at end of file
diff --git a/mod/groups/views/default/discussion/replies.php b/mod/groups/views/default/discussion/replies.php
new file mode 100644
index 000000000..2bfb6f0cd
--- /dev/null
+++ b/mod/groups/views/default/discussion/replies.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * List replies with optional add form
+ *
+ * @uses $vars['entity']        ElggEntity
+ * @uses $vars['show_add_form'] Display add form or not
+ */
+
+$show_add_form = elgg_extract('show_add_form', $vars, true);
+
+echo '<div id="group-replies" class="mtl">';
+
+$options = array(
+	'guid' => $vars['entity']->getGUID(),
+	'annotation_name' => 'group_topic_post',
+);
+$html = elgg_list_annotations($options);
+if ($html) {
+	echo '<h3>' . elgg_echo('group:replies') . '</h3>';
+	echo $html;
+}
+
+if ($show_add_form) {
+	$form_vars = array('class' => 'mtm');
+	echo elgg_view_form('discussion/reply/save', $form_vars, $vars);
+}
+
+echo '</div>';