8 files changed, 13 insertions, 22 deletions
diff --git a/modules/field_ui/field_ui-rtl.css b/modules/field_ui/field_ui-rtl.css
index 3defc5688..123a840bf 100644
--- a/modules/field_ui/field_ui-rtl.css
+++ b/modules/field_ui/field_ui-rtl.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* 'Manage fields' overview */
 table.field-ui-overview tr.add-new .label-input {
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 6274d5ab1..96beb1334 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -875,7 +874,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
       'class' => array('field-ui-overview'),
       'id' => 'field-display-overview',
     ),
-    // Add AJAX wrapper.
+    // Add Ajax wrapper.
     '#prefix' => '<div id="field-display-overview-wrapper">',
     '#suffix' => '</div>',
   );
@@ -1157,7 +1156,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
       'callback' => 'field_ui_display_overview_multistep_js',
       'wrapper' => 'field-display-overview-wrapper',
       'effect' => 'fade',
-      // The button stays hidden, so we hide the AJAX spinner too. Ad-hoc
+      // The button stays hidden, so we hide the Ajax spinner too. Ad-hoc
       // spinners will be added manually by the client-side script.
       'progress' => 'none',
     ),
@@ -1218,7 +1217,7 @@ function field_ui_display_overview_multistep_submit($form, &$form_state) {
 }
 
 /**
- * AJAX handler for multistep buttons on the 'Manage display' screen.
+ * Ajax handler for multistep buttons on the 'Manage display' screen.
  */
 function field_ui_display_overview_multistep_js($form, &$form_state) {
   $trigger = $form_state['triggering_element'];
@@ -1793,7 +1792,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
     '#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())),
-    '#weight' => 0,
+    '#weight' => -5,
   );
 
   // Build the widget component of the instance.
diff --git a/modules/field_ui/field_ui.api.php b/modules/field_ui/field_ui.api.php
index df34469ca..e07a9373d 100644
--- a/modules/field_ui/field_ui.api.php
+++ b/modules/field_ui/field_ui.api.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
diff --git a/modules/field_ui/field_ui.css b/modules/field_ui/field_ui.css
index 68307c324..c25d2a436 100644
--- a/modules/field_ui/field_ui.css
+++ b/modules/field_ui/field_ui.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* 'Manage fields' and 'Manage display' overviews */
 table.field-ui-overview tr.add-new .label-input {
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index 852447365..41d0999bc 100644
--- a/modules/field_ui/field_ui.info
+++ b/modules/field_ui/field_ui.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Field UI
 description = User interface for the Field API.
 package = Core
diff --git a/modules/field_ui/field_ui.js b/modules/field_ui/field_ui.js
index cd27bffd8..b63399f3d 100644
--- a/modules/field_ui/field_ui.js
+++ b/modules/field_ui/field_ui.js
@@ -1,4 +1,3 @@
-// $Id$
 
 (function($) {
 
@@ -167,7 +166,7 @@ Drupal.fieldUIOverview = {
         refreshRows = rowHandler.regionChange(region);
         // Update the row region.
         rowHandler.region = region;
-        // AJAX-update the rows.
+        // Ajax-update the rows.
         Drupal.fieldUIOverview.AJAXRefreshRows(refreshRows);
       }
     }
@@ -206,7 +205,7 @@ Drupal.fieldUIOverview = {
   },
 
   /**
-   * Triggers AJAX refresh of selected rows.
+   * Triggers Ajax refresh of selected rows.
    *
    * The 'format type' selects can trigger a series of changes in child rows.
    * The #ajax behavior is therefore not attached directly to the selects, but
@@ -215,7 +214,7 @@ Drupal.fieldUIOverview = {
    * @param rows
    *   A hash object, whose keys are the names of the rows to refresh (they
    *   will receive the 'ajax-new-content' effect on the server side), and
-   *   whose values are the DOM element in the row that should get an AJAX
+   *   whose values are the DOM element in the row that should get an Ajax
    *   throbber.
    */
   AJAXRefreshRows: function (rows) {
@@ -234,7 +233,7 @@ Drupal.fieldUIOverview = {
         .addClass('progress-disabled')
         .after($throbber);
 
-      // Fire the AJAX update.
+      // Fire the Ajax update.
       $('input[name=refresh_rows]').val(rowNames.join(' '));
       $('input#edit-refresh').mousedown();
 
@@ -295,7 +294,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = {
    * @param region
    *   The name of the new region for the row.
    * @return
-   *   A hash object indicating which rows should be AJAX-updated as a result
+   *   A hash object indicating which rows should be Ajax-updated as a result
    *   of the change, in the format expected by
    *   Drupal.displayOverview.AJAXRefreshRows().
    */
diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module
index 3d2ddf689..7355e879b 100644
--- a/modules/field_ui/field_ui.module
+++ b/modules/field_ui/field_ui.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -24,7 +23,7 @@ function field_ui_help($path, $arg) {
       $output .= '<dt>' . t('What type of data the field will store') . '</dt>';
       $output .= '<dd>' . t('Each field can store one type of data (text, number, file, etc.). When you define a field, you choose a particular <em>field type</em>, which corresponds to the type of data you want to store. The field type cannot be changed after you have created the field.') . '</dd>';
       $output .= '<dt>' . t('How the data will be input and displayed') . '</dt>';
-      $output .= '<dd>' . t('Each field type has one or more available <em>widgets</em> associated with it; each widget provides a mechanism for data input when you are editing (text box, select list, file upload, etc.). Each field type also has one or more display options, which determine how the field is displayed to site visitors. The widget and display display options can be changed after you have created the field.') . '</dd>';
+      $output .= '<dd>' . t('Each field type has one or more available <em>widgets</em> associated with it; each widget provides a mechanism for data input when you are editing (text box, select list, file upload, etc.). Each field type also has one or more display options, which determine how the field is displayed to site visitors. The widget and display options can be changed after you have created the field.') . '</dd>';
       $output .= '<dt>' . t('How many values the field will store') . '</dt>';
       $output .= '<dd>' . t('You can store one value, a specific maximum number of values, or an unlimited number of values in each field. For example, an employee identification number field might store a single number, whereas a phone number field might store multiple phone numbers. This setting can be changed after you have created the field, but if you reduce the maximum number of values, you may lose information.') . '</dd>';
       $output .= '</dl>';
@@ -234,7 +233,7 @@ function field_ui_menu_load($field_name, $entity_type, $bundle_name, $bundle_pos
  * Menu title callback.
  */
 function field_ui_menu_title($instance) {
-  return t($instance['label']);
+  return $instance['label'];
 }
 
 /**
@@ -363,4 +362,3 @@ function field_ui_form_node_type_form_submit($form, &$form_state) {
     $form_state['redirect'] = _field_ui_bundle_admin_path('node', $form_state['values']['type']) .'/fields';
   }
 }
-
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index e67fc2bb7..77f79ce33 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -1,9 +1,8 @@
 <?php
-// $Id$
 
 /**
  * @file
- * Unit test file for fields in core UI.
+ * Tests for field_ui.module.
  */
 
 /**
@@ -389,7 +388,7 @@ class FieldUIManageFieldsTestCase extends FieldUITestCase {
       'bundle' => $this->type,
       'entity_type' => 'node',
       'label' => t('Hidden field'),
-      'widget_type' => 'test_field_widget',
+      'widget' => array('type' => 'test_field_widget'),
     );
     field_create_instance($instance);
     $this->assertTrue(field_read_instance('node', $field_name, $this->type), t('An instance of the field %field was created programmatically.', array('%field' => $field_name)));