Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.113.2.70.2.79
diff -u -r1.113.2.70.2.79 webform.module
--- webform.module	19 Dec 2008 05:08:04 -0000	1.113.2.70.2.79
+++ webform.module	19 Dec 2008 18:08:46 -0000
@@ -463,25 +463,17 @@
   );
 
   /* Start Edit Form */
-  $form['webform']['settings'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Webform Settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
-    '#weight' => -4,
-    '#parents' => array('webform'),
-  );
-
-  $form['webform']['settings']['title'] = array(
+  $form['title'] = array(
     '#type' => 'textfield',
     '#title' => t('Title'),
     '#default_value' => $node->title,
     '#maxlength' => 128,
     '#required' => TRUE,
     '#tree' => FALSE,
+    '#weight' => -10,
   );
 
-  $form['webform']['settings']['body'] = array(
+  $form['body'] = array(
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#description' => t('Text to be shown as teaser and before the form.'),
@@ -489,18 +481,21 @@
     '#cols' => 40,
     '#rows' => 10,
     '#tree' => FALSE,
+    '#weight' => -9,
   );
 
-  $form['webform']['settings']['confirmation'] = array(
+  $form['confirmation'] = array(
     '#type' => 'textarea',
     '#title' => t("Confirmation message or redirect URL"),
     '#description' => t("Message to be shown upon successful submission or a path to a redirect page. Redirect pages must start with <em>http://</em> for external sites or <em>internal:</em> for an internal path. i.e. <em>http://www.example.com</em> or <em>internal:node/10</em>"),
     '#default_value' => $node->webform['confirmation'],
     '#cols' => 40,
     '#rows' => 10,
+    '#weight' => -8,
   );
 
-  $form['webform']['settings']['format'] = filter_form($node->format);
+  $form['format'] = filter_form($node->format);
+  $form['format']['#weight'] = -7;
   /* End Edit Form */
 
   /* Start per-role submission control */