Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.66
diff -u -p -r1.66 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	16 Sep 2010 20:14:49 -0000	1.66
+++ modules/field_ui/field_ui.admin.inc	21 Sep 2010 13:00:13 -0000
@@ -330,12 +330,16 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $instance['widget']['weight'],
         '#size' => 3,
+        '#title' => t('Weight for @title', array('@title' => $instance['label'])),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-weight')),
        ),
       'parent_wrapper' => array(
         'parent' => array(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
+          '#title' => t('Parent for @title', array('@title' => $instance['label'])),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array('fields', $name, 'parent'),
         ),
@@ -394,14 +398,16 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $extra_field['weight'],
         '#size' => 3,
-        '#attributes' => array('class' => array('field-weight')),
+        '#title' => t('Weight for @title', array('@title' => $extra_field['label'])),
         '#title_display' => 'invisible',
-        '#title' => t('Weight for @row', array('@row' => $extra_field['label'])),
+        '#attributes' => array('class' => array('field-weight')),
       ),
       'parent_wrapper' => array(
         'parent' => array(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
+          '#title' => t('Parent for @title', array('@title' => $extra_field['label'])),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array('fields', $name, 'parent'),
         ),
@@ -442,6 +448,8 @@ function field_ui_field_overview_form($f
       'label' => array(
         '#type' => 'textfield',
         '#size' => 15,
+        '#title' => t('New field label'),
+        '#title_display' => 'invisible',
         '#description' => t('Label'),
         '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Add new field') .'</div>',
         '#suffix' => '</div>',
@@ -450,8 +458,8 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $max_weight + 1,
         '#size' => 3,
-        '#title_display' => 'invisible',
         '#title' => t('Weight for new field'),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-weight')),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
       ),
@@ -459,6 +467,8 @@ function field_ui_field_overview_form($f
         'parent' => array(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
+          '#title' => t('Parent for new field'),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
           '#parents' => array('fields', $name, 'parent'),
@@ -476,12 +486,16 @@ function field_ui_field_overview_form($f
         '#field_suffix' => '</span>&lrm;',
         '#attributes' => array('dir'=>'ltr'),
         '#size' => 10,
+        '#title' => t('New field name'),
+        '#title_display' => 'invisible',
         '#description' => t('Field name (a-z, 0-9, _)'),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
       ),
       'type' => array(
         '#type' => 'select',
         '#options' => $field_type_options,
+        '#title' => t('Type of new field'),
+        '#title_display' => 'invisible',
         '#description' => t('Type of data to store.'),
         '#attributes' => array('class' => array('field-type-select')),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
@@ -489,6 +503,8 @@ function field_ui_field_overview_form($f
       'widget_type' => array(
         '#type' => 'select',
         '#options' => $widget_type_options,
+        '#title' => t('Widget for new field'),
+        '#title_display' => 'invisible',
         '#description' => t('Form element to edit the data.'),
         '#attributes' => array('class' => array('widget-type-select')),
         '#cell_attributes' => array('colspan' => 3),
@@ -509,6 +525,8 @@ function field_ui_field_overview_form($f
       'label' => array(
         '#type' => 'textfield',
         '#size' => 15,
+        '#title' => t('Existing field label'),
+        '#title_display' => 'invisible',
         '#description' => t('Label'),
         '#attributes' => array('class' => array('label-textfield')),
         '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Add existing field') .'</div>',
@@ -518,8 +536,8 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $max_weight + 2,
         '#size' => 3,
+        '#title' => t('Weight for existing field'),
         '#title_display' => 'invisible',
-        '#title' => t('Weight for added field'),
         '#attributes' => array('class' => array('field-weight')),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
       ),
@@ -527,6 +545,8 @@ function field_ui_field_overview_form($f
         'parent' => array(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
+          '#title' => t('Parent for existing field'),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
           '#parents' => array('fields', $name, 'parent'),
@@ -540,6 +560,8 @@ function field_ui_field_overview_form($f
       'field_name' => array(
         '#type' => 'select',
         '#options' => $existing_field_options,
+        '#title' => t('Existing field to share'),
+        '#title_display' => 'invisible',
         '#description' => t('Field to share'),
         '#attributes' => array('class' => array('field-select')),
         '#cell_attributes' => array('colspan' => 2),
@@ -548,6 +570,8 @@ function field_ui_field_overview_form($f
       'widget_type' => array(
         '#type' => 'select',
         '#options' => $widget_type_options,
+        '#title' => t('Widget for existing field'),
+        '#title_display' => 'invisible',
         '#description' => t('Form element to edit the data.'),
         '#attributes' => array('class' => array('widget-type-select')),
         '#cell_attributes' => array('colspan' => 3),
@@ -883,6 +907,8 @@ function field_ui_display_overview_form(
         '#type' => 'textfield',
         '#default_value' => $display['weight'],
         '#size' => 3,
+        '#title' => t('Weight for @title', array('@title' => check_plain($instance['label']))),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-weight')),
       ),
       'parent_wrapper' => array(
@@ -890,6 +916,8 @@ function field_ui_display_overview_form(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
           '#default_value' => '',
+          '#title' => t('Label display for @title', array('@title' => check_plain($instance['label']))),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array('fields', $name, 'parent'),
         ),
@@ -901,6 +929,8 @@ function field_ui_display_overview_form(
       ),
       'label' => array(
         '#type' => 'select',
+        '#title' => t('Label display for @title', array('@title' => check_plain($instance['label']))),
+        '#title_display' => 'invisible',
         '#options' => $field_label_options,
         '#default_value' => $display['label'],
       ),
@@ -914,6 +944,8 @@ function field_ui_display_overview_form(
         '#options' => $formatter_options,
         '#default_value' => $display['type'],
         '#parents' => array('fields', $name, 'type'),
+        '#title' => t('Formatter for @title', array('@title' => check_plain($instance['label']))),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-formatter-type')),
       ),
       'settings_edit_form' => array(),
@@ -1037,6 +1069,8 @@ function field_ui_display_overview_form(
         '#type' => 'textfield',
         '#default_value' => $display['weight'],
         '#size' => 3,
+        '#title' => t('Weight for @title', array('@title' => check_plain($extra_field['label']))),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-weight')),
       ),
       'parent_wrapper' => array(
@@ -1044,6 +1078,8 @@ function field_ui_display_overview_form(
           '#type' => 'select',
           '#options' => $table['#parent_options'],
           '#default_value' => '',
+          '#title' => t('Parents for @title', array('@title' => check_plain($extra_field['label']))),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array('fields', $name, 'parent'),
         ),
@@ -1062,6 +1098,8 @@ function field_ui_display_overview_form(
           '#options' => $extra_visibility_options,
           '#default_value' => $display['visible'] ? 'visible' : 'hidden',
           '#parents' => array('fields', $name, 'type'),
+          '#title' => t('Visibility for @title', array('@title' => check_plain($extra_field['label']))),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-formatter-type')),
         ),
       ),