? 553308_text_with_summary_cleanup_4.patch
? cleanup.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/field/modules/text/text.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.js,v
retrieving revision 1.1
diff -u -p -r1.1 text.js
--- modules/field/modules/text/text.js	11 Sep 2009 13:30:49 -0000	1.1
+++ modules/field/modules/text/text.js	5 Oct 2009 19:40:02 -0000
@@ -8,7 +8,7 @@
 Drupal.behaviors.textTextareaSummary = {
   attach: function (context, settings) {
     $('textarea.text-textarea-summary:not(.text-textarea-summary-processed)', context).addClass('text-textarea-summary-processed').each(function () {
-      var $fieldset = $(this).closest('#body-wrapper');
+      var $fieldset = $(this).closest('.text-textarea-with-summary-wrapper');
       var $summary = $fieldset.find('div.text-summary-wrapper');
       var $summaryLabel = $summary.find('div.form-type-textarea label');
       var $full = $fieldset.find('div.text-full-wrapper');
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.30
diff -u -p -r1.30 text.module
--- modules/field/modules/text/text.module	26 Sep 2009 15:57:38 -0000	1.30
+++ modules/field/modules/text/text.module	5 Oct 2009 19:40:03 -0000
@@ -152,9 +152,9 @@ function text_field_instance_settings_fo
   if ($field['type'] == 'text_with_summary') {
     $form['display_summary'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Summary input'),
+      '#title' => t('Show summary field'),
       '#default_value' => $settings['display_summary'],
-      '#description' => t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display format.'),
+      '#description' => t('This allows authors to create an explicit summary, to be displayed instead of the automatically trimmed text.'),
     );
   }
 
@@ -746,6 +746,9 @@ function text_textarea_with_summary_proc
     $element[$field_key]['#text_format'] = $format;
   }
 
+  $element['#prefix'] = '<div class="text-textarea-with-summary-wrapper">';
+  $element['#suffix'] = '</div>';
+
   return $element;
 }
 
Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.21
diff -u -p -r1.21 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	2 Oct 2009 14:39:43 -0000	1.21
+++ modules/field_ui/field_ui.admin.inc	5 Oct 2009 20:02:42 -0000
@@ -1046,15 +1046,13 @@ function field_ui_field_edit_form($form,
     '#title' => t('Label'),
     '#default_value' => !empty($instance['label']) ? $instance['label'] : $field['field_name'],
     '#required' => TRUE,
-    '#description' => t('The human-readable label for this field.'),
     '#weight' => -20,
   );
   $form['instance']['required'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Required'),
+    '#title' => t('Required field'),
     '#default_value' => !empty($instance['required']),
-    '#description' => t('Check if a value must be provided.'),
-    '#weight' => -10,
+    '#weight' => 0,
   );
 
   $form['instance']['description'] = array(
@@ -1062,7 +1060,7 @@ function field_ui_field_edit_form($form,
     '#title' => t('Help text'),
     '#default_value' => !empty($instance['description']) ? $instance['description'] : '',
     '#rows' => 5,
-    '#description' => t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())),
+    '#description' => t('Help to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())),
     '#required' => FALSE,
     '#weight' => 0,
   );
@@ -1187,7 +1185,7 @@ function field_ui_field_edit_instance_pr
  * Build default value fieldset.
  */
 function field_ui_default_value_widget($field, $instance, &$form, &$form_state) {
-  $form['instance']['default_value_widget'] = array(
+  $form['default_value_widget'] = array(
     '#type' => 'fieldset',
     '#title' => t('Default value'),
     '#collapsible' => FALSE,
@@ -1209,7 +1207,7 @@ function field_ui_default_value_widget($
   function_exists('field_default_form');
   // @todo Allow multiple values (requires more work on 'add more' JS handler).
   $widget_form = field_default_form(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state, 0);
-  $form['instance']['default_value_widget'] += $widget_form;
+  $form['default_value_widget'] += $widget_form;
   $form['#fields'][$field['field_name']]['form_path'] = array(
     'instance',
     'default_value_widget',