Index: fbssc.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fbssc/fbssc.js,v
retrieving revision 1.1
diff -u -r1.1 fbssc.js
--- fbssc.js	3 Feb 2010 05:37:11 -0000	1.1
+++ fbssc.js	17 Feb 2010 22:58:30 -0000
@@ -1,10 +1,5 @@
 // $Id$
 Drupal.behaviors.fbssc = function (context) {
-  $('.fbssc_show_comment_form').one('click', function() {
-    $(this).hide();
-    $('#'+ this.id +' + div').show();
-    return false;
-  });
   $('a.fbssc_show_comments').one('click', function() {
     $(this).hide();
     $('#'+ this.id +' ~ div.fbssc_hide').show();
Index: fbssc.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fbssc/fbssc.module,v
retrieving revision 1.1.2.8
diff -u -r1.1.2.8 fbssc.module
--- fbssc.module	13 Feb 2010 05:42:08 -0000	1.1.2.8
+++ fbssc.module	17 Feb 2010 23:30:35 -0000
@@ -258,12 +258,6 @@
     $path = drupal_get_path('module', 'fbssc');
     drupal_add_js($path .'/fbssc.js');
     $output = '';
-    if ($delay_load_form && !fbssc_count_comments($sid)) {
-      $output = '<div class="fbssc_show_comment_form" id="fbssc_toggle_'. $sid .'">'.
-        l(t('Comment'), 'statuses/'. $sid, array('attributes' => array('class' => 'fbssc_show_comment_form_link')))
-        .'</div>';
-        return $output .'<div class="fbssc_hide fbssc_form">'. drupal_get_form('fbssc_box', $sid, $delay_load_comments) .'</div>';
-    }
     return '<div class="fbssc_form">'. drupal_get_form('fbssc_box', $sid, $delay_load_comments) .'</div>';
   }
 }
@@ -507,13 +501,18 @@
   }
   $form['before'] = array('#value' => '<div id="fbssc_replace_'. $sid .'">');
   $form['comments'] = array('#value' => theme('fbssc_items', fbssc_get_comments($sid), $delay_load, $form['#qu']));
-  $form['status-comment'] = array(
+  $form['comment'] = array(
+    '#title' => t('Comment'),
+    '#type' => 'fieldset',
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE
+  );
+  $form['comment']['status-comment'] = array(
     '#type' => 'textarea',
-    '#rows' => 1,
+    '#rows' => 2,
     '#required' => TRUE,
   );
-  $form['after'] = array('#value' => '</div>');
-  $form['save'] = array(
+  $form['comment']['save'] = array(
     '#type' => 'submit',
     '#value' => t('Comment'),
     '#ahah' => array(
@@ -523,6 +522,7 @@
       'method' => 'replace',
     ),
   );
+  $form['after'] = array('#value' => '</div>');
   $form['#sid'] = $sid;
   if ($form_state['fbssc']['sid']) {
     $form['#sid'] = $form_state['fbssc']['sid'];
@@ -562,7 +562,7 @@
   $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
   //Get HTML for the replacement form. Only these elements will be AHAH-refreshed.
   $new_form['comments']       = $form['comments'];
-  $new_form['status-comment'] = $form['status-comment'];
+  //$new_form['comment']['status-comment'] = $form['comment']['status-comment'];
   //$new_form['save']           = $form['save'];
   $output = theme('status_messages') . drupal_render($new_form);
   //Return the results.