diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-05 00:20:57 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-05 00:20:57 +0000 |
| commit | 5b1dd341173a44984315cfade6dd1c26bef8efb7 (patch) | |
| tree | e427993d466032dd2ce4b9ba90fc132cbdc7d5d9 | |
| parent | aaced028268109c9ed75cb2d02224a3c65797aa3 (diff) | |
| download | elgg-5b1dd341173a44984315cfade6dd1c26bef8efb7.tar.gz elgg-5b1dd341173a44984315cfade6dd1c26bef8efb7.tar.bz2 | |
Fixes #3275 forms in a river item are not forced to be hidden
git-svn-id: http://code.elgg.org/elgg/trunk@8942 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/groups/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/groups/start.php | 3 | ||||
| -rw-r--r-- | mod/groups/views/default/river/object/groupforumtopic/create.php | 6 | ||||
| -rw-r--r-- | views/default/css/elements/components.php | 1 | ||||
| -rw-r--r-- | views/default/river/elements/footer.php | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index 789a9efe8..dc65244fd 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -126,6 +126,8 @@ $english = array( 'discussion:reply:deleted' => 'Discussion reply has been deleted.', 'discussion:reply:error:notdeleted' => 'Could not delete the discussion reply', + 'reply:this' => 'Reply to this', + 'group:replies' => 'Replies', 'groups:forum:created' => 'Created %s with %d comments', 'groups:forum:created:single' => 'Created %s with %d reply', diff --git a/mod/groups/start.php b/mod/groups/start.php index b7047144b..ee99ac9b4 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -731,7 +731,8 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) { $options = array( 'name' => 'reply', 'href' => "#groups-reply-$object->guid", - 'text' => elgg_echo('reply'), + 'text' => elgg_view_icon('speech-bubble'), + 'title' => elgg_echo('reply:this'), 'class' => "elgg-toggler", 'priority' => 50, ); diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php index ca4747338..466196921 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/create.php +++ b/mod/groups/views/default/river/object/groupforumtopic/create.php @@ -36,7 +36,7 @@ if ($excerpt) { if (elgg_is_logged_in() && $container->canWriteToContainer()) { // inline comment form - echo elgg_view_form('discussion/reply/save', array( - 'id' => "groups-reply-{$object->getGUID()}", - ), array('entity' => $object, 'inline' => true)); + $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/css/elements/components.php b/views/default/css/elements/components.php index df1632db4..bbd6b4cfb 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -255,7 +255,6 @@ -webkit-border-radius: 5px; border-radius: 5px; - display: none; height: 30px; } .elgg-river-item input[type=text] { diff --git a/views/default/river/elements/footer.php b/views/default/river/elements/footer.php index 7cf9dd925..f1e79f131 100644 --- a/views/default/river/elements/footer.php +++ b/views/default/river/elements/footer.php @@ -47,6 +47,6 @@ if ($comments) { } // inline comment form -echo elgg_view_form('comments/add', array( - 'id' => "comments-add-{$object->getGUID()}", -), array('entity' => $object, 'inline' => true)); +$form_vars = array('id' => "comments-add-{$object->getGUID()}", 'class' => 'hidden'); +$body_vars = array('entity' => $object, 'inline' => true); +echo elgg_view_form('comments/add', $form_vars, $body_vars); |