diff options
| author | Evan Winslow <evan@elgg.org> | 2011-06-13 22:23:09 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2011-06-13 22:23:09 -0700 |
| commit | b766230d132bedf68ec3c63f72538fefa54c62e2 (patch) | |
| tree | 8c3c03a7006426dd0a85ce2e52ed8b309bcd7e12 | |
| parent | dea90f2e6af72473e24e5e67b154754faf84513e (diff) | |
| download | elgg-b766230d132bedf68ec3c63f72538fefa54c62e2.tar.gz elgg-b766230d132bedf68ec3c63f72538fefa54c62e2.tar.bz2 | |
Renamed river footer to a more semantic "responses". Fixed discussion
to work inline again with this new layout.
| -rw-r--r-- | mod/groups/start.php | 3 | ||||
| -rw-r--r-- | mod/groups/views/default/river/object/groupforumtopic/create.php | 7 | ||||
| -rw-r--r-- | views/default/river/elements/body.php | 4 | ||||
| -rw-r--r-- | views/default/river/elements/responses.php (renamed from views/default/river/elements/footer.php) | 0 |
4 files changed, 4 insertions, 10 deletions
diff --git a/mod/groups/start.php b/mod/groups/start.php index 73bdd08a9..5aaba017c 100644 --- 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 cca44e523..f92e54a5c 100644 --- 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 a76cae909..080c04644 100644 --- 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 index f1e79f131..f1e79f131 100644 --- a/views/default/river/elements/footer.php +++ b/views/default/river/elements/responses.php |