Renamed river footer to a more semantic "responses". Fixed discussion

to work inline again with this new layout.

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 73bdd08a9880b95feee089b0e9588d8f40269d4b..5aaba017c7609b8adf203d751b517163f24beafd 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -621,7 +621,8 @@ function discussion_init() {
 
        // commenting not allowed on discussion topics (use a different annotation)
        elgg_register_plugin_hook_handler('permissions_check:comment', 'object', 'discussion_comment_override');
-
+       elgg_extend_view('river/elements/responses', 'discussion/river');
+       
        $action_base = elgg_get_plugins_path() . 'groups/actions/discussion';
        elgg_register_action('discussion/save', "$action_base/save.php");
        elgg_register_action('discussion/delete', "$action_base/delete.php");

diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index cca44e52344a6b1204142304bd129bbf5a793dfc..f92e54a5c53cec21403f8a25735277ec2b8d859a 100644 (file)
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -11,10 +11,3 @@ echo elgg_view('river/item', array(
        'item' => $vars['item'],
        'message' => $excerpt,
 ));
-
-if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
-       // inline comment form
-       $form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden');
-       $body_vars = array('entity' => $object, 'inline' => true);
-       echo elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
-}

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index a76cae9097746878738d6f4bba20b5dd8868f20c..080c046446715ad03317514abbecd3dbd4cd5e16 100644 (file)
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -32,7 +32,7 @@ if ($attachments !== false) {
        $attachments = "<div class=\"elgg-river-attachments\">$attachments</div>";
 }
 
-$footer = elgg_view('river/elements/footer', $vars);
+$responses = elgg_view('river/elements/responses', $vars);
 
 $group_string = '';
 $object = $item->getObjectEntity();
@@ -50,5 +50,5 @@ $menu
 <div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div>
 $message
 $attachments
-$footer
+$responses
 RIVER;

diff --git a/views/default/river/elements/footer.php b/views/default/river/elements/responses.php
similarity index 100%
rename from views/default/river/elements/footer.php
rename to views/default/river/elements/responses.php