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

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 789a9efe8f65e6306c26f304f4342d1f7d4fee16..dc65244fd6ca4590ffc8aa7768004ecd66eedb3a 100644 (file)
--- 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 b7047144b7a154abb079fb6bbacebe664cff6430..ee99ac9b47b3ae560f4c966e5365607775b7e5a4 100644 (file)
--- 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 ca47473380f7a02c16946a6e9d290f47eca49c17..466196921d13e98d8381b9e3884aeaa2662d6a5c 100644 (file)
--- 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 df1632db449f83f26464adb69a2ab421c924eea7..bbd6b4cfb3888e323ddf36db80bad80a6cc15a54 100644 (file)
--- 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 7cf9dd925e0a728bb5f60f11572e43c7785458f2..f1e79f131f6a6e0b38d957f2111be331d684d040 100644 (file)
--- 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);