Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.61
diff -u -p -r1.61 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	20 Aug 2010 01:10:42 -0000	1.61
+++ modules/field_ui/field_ui.admin.inc	21 Aug 2010 01:39:41 -0000
@@ -227,12 +227,16 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $weight,
         '#size' => 3,
+        '#title' => t('Weight for !title', array('!title' => $instance['field_name'])),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-weight')),
        ),
       'parent_wrapper' => array(
         'parent' => array(
           '#type' => 'select',
           '#options' => $parent_options,
+          '#title' => t('Parent for !title', array('!title' => $instance['field_name'])),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array($name, 'parent'),
         ),
@@ -293,13 +297,15 @@ function field_ui_field_overview_form($f
         '#default_value' => $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'])),
       ),
       'parent_wrapper' => array(
         'parent' => array(
           '#type' => 'select',
           '#options' => $parent_options,
+          '#title' => t('Parent for !title', array('!title' => $extra_field['label'])),
+          '#title_display' => 'invisible',
           '#attributes' => array('class' => array('field-parent')),
           '#parents' => array($name, 'parent'),
         ),
@@ -339,6 +345,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>',
@@ -347,8 +355,8 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $weight,
         '#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>',
       ),
@@ -356,6 +364,8 @@ function field_ui_field_overview_form($f
         'parent' => array(
           '#type' => 'select',
           '#options' => $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($name, 'parent'),
@@ -373,12 +383,16 @@ function field_ui_field_overview_form($f
         '#field_suffix' => '</span>&lrm;',
         '#attributes' => array('dir'=>'ltr'),
         '#size' => 15,
+        '#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('New field type'),
+        '#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>',
@@ -387,6 +401,8 @@ function field_ui_field_overview_form($f
         '#type' => 'select',
         '#options' => $widget_type_options,
         '#description' => t('Form element to edit the data.'),
+        '#title' => t('New widget type'),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('widget-type-select')),
         '#cell_attributes' => array('colspan' => 3),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
@@ -407,6 +423,8 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#size' => 15,
         '#description' => t('Label'),
+        '#title' => t('Existing field label'),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('label-textfield')),
         '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Add existing field') .'</div>',
         '#suffix' => '</div>',
@@ -415,8 +433,8 @@ function field_ui_field_overview_form($f
         '#type' => 'textfield',
         '#default_value' => $weight,
         '#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>',
       ),
@@ -424,6 +442,8 @@ function field_ui_field_overview_form($f
         'parent' => array(
           '#type' => 'select',
           '#options' => $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($name, 'parent'),
@@ -438,6 +458,8 @@ function field_ui_field_overview_form($f
         '#type' => 'select',
         '#options' => $existing_field_options,
         '#description' => t('Field to share'),
+        '#title' => t('Existing field to share'),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('field-select')),
         '#cell_attributes' => array('colspan' => 2),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
@@ -446,6 +468,8 @@ function field_ui_field_overview_form($f
         '#type' => 'select',
         '#options' => $widget_type_options,
         '#description' => t('Form element to edit the data.'),
+        '#title' => t('Existing widget type'),
+        '#title_display' => 'invisible',
         '#attributes' => array('class' => array('widget-type-select')),
         '#cell_attributes' => array('colspan' => 3),
         '#prefix' => '<div class="add-new-placeholder">&nbsp;</div>',
@@ -750,6 +774,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',
     );
     $table[$name]['hidden_name'] = array(
       '#type' => 'hidden',
@@ -759,6 +785,8 @@ function field_ui_display_overview_form(
       '#type' => 'select',
       '#options' => $field_label_options,
       '#default_value' => $display['label'],
+      '#title' => t('Label display for !title', array('!title' => check_plain($instance['label']))),
+      '#title_display' => 'invisible',
     );
     $field = field_info_field($instance['field_name']);
 
@@ -778,6 +806,8 @@ function field_ui_display_overview_form(
       ),
       '#field_name' => $name,
       '#op' => 'change_type',
+      '#title' => t('Formatter for !title', array('!title' => check_plain($instance['label']))),
+      '#title_display' => 'invisible',
     );
     // Formatter settings.
 
@@ -889,6 +919,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',
     );
     $table[$name]['hidden_name'] = array(
       '#type' => 'hidden',
@@ -898,6 +930,8 @@ function field_ui_display_overview_form(
       '#type' => 'select',
       '#options' => $extra_visibility_options,
       '#default_value' => $display['visible'] ? 'visible' : 'hidden',
+      '#title' => t('Visibility for !title', array('!title' => check_plain($extra_field['label']))),
+      '#title_display' => 'invisible',
     );
     $table[$name]['settings_summary'] = array();
     $table[$name]['settings_edit'] = array();