diff --git includes/theme.inc includes/theme.inc index e325ad7..c39bc35 100644 --- includes/theme.inc +++ includes/theme.inc @@ -1617,6 +1617,7 @@ function theme_breadcrumb($variables) { * - sticky: Use a "sticky" table header. * - empty: The message to display in an extra row if table does not have any * rows. + * @todo document no_striping. */ function theme_table($variables) { $header = $variables['header']; @@ -1731,8 +1732,10 @@ function theme_table($variables) { } if (count($cells)) { // Add odd/even class - $class = $flip[$class]; - $attributes['class'][] = $class; + if (empty($row['no_striping'])) { + $class = $flip[$class]; + $attributes['class'][] = $class; + } // Build row $output .= ' '; @@ -2002,7 +2005,7 @@ function theme_indentation($variables) { /** * Returns HTML output for a single table cell for theme_table(). - * + * * @param $cell * Array of cell information, or string to display in cell. * @param bool $header diff --git misc/tabledrag.js misc/tabledrag.js index 3d056cc..14f5c5d 100644 --- misc/tabledrag.js +++ misc/tabledrag.js @@ -1016,8 +1016,11 @@ Drupal.tableDrag.prototype.row.prototype.validIndentInterval = function (prevRow minIndent = nextRow ? $('.indentation', nextRow).size() : 0; // Maximum indentation: - if (!prevRow || $(this.element).is('.tabledrag-root')) { - // Do not indent the first row in the table or 'root' rows.. + if (!prevRow || $(prevRow).is(':not(.draggable)') || $(this.element).is('.tabledrag-root')) { + // Do not indent: + // - the first row in the table, + // - rows dragged below a non-draggable row, + // - 'root' rows. maxIndent = 0; } else { diff --git modules/field/modules/text/text.module modules/field/modules/text/text.module index c2c06a3..299f1e3 100644 --- modules/field/modules/text/text.module +++ modules/field/modules/text/text.module @@ -299,7 +299,7 @@ function text_field_formatter_settings_summary($field, $instance, $view_mode) { $summary = ''; if (strpos($display['type'], '_trimmed') !== FALSE) { - $summary = t('Trim length') . ': ' . $settings['trim_length']; + $summary = t('Length: @length characters', array('@length' => $settings['trim_length'])); } return $summary; diff --git modules/field_ui/field_ui-display-overview-table.tpl.php modules/field_ui/field_ui-display-overview-table.tpl.php deleted file mode 100644 index 9933c56..0000000 --- modules/field_ui/field_ui-display-overview-table.tpl.php +++ /dev/null @@ -1,83 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - settings_edit_form)) : ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
human_name; ?>weight . $row->hidden_name; ?>label)) print $row->label; ?> - type; ?> - settings_edit_form; ?> - - type; ?> - - settings_summary; ?> - - settings_edit; ?> -
human_name; ?>weight . $row->hidden_name; ?>label)) print $row->label; ?>type; ?> - settings_summary; ?> - - settings_edit; ?> -
-
- diff --git modules/field_ui/field_ui-rtl.css modules/field_ui/field_ui-rtl.css index 233390b..921aed0 100644 --- modules/field_ui/field_ui-rtl.css +++ modules/field_ui/field_ui-rtl.css @@ -1,7 +1,6 @@ /* $Id: field_ui-rtl.css,v 1.2 2010/06/26 02:06:53 dries Exp $ */ /* 'Manage fields' overview */ -#field-overview tr.add-new .label-input { +table.field-ui-overview tr.add-new .label-input { float: right; } - diff --git modules/field_ui/field_ui.admin.inc modules/field_ui/field_ui.admin.inc index af83378..49a790f 100644 --- modules/field_ui/field_ui.admin.inc +++ modules/field_ui/field_ui.admin.inc @@ -80,18 +80,56 @@ function _field_ui_reduce_order($array, $a) { } /** - * Theme preprocess function for theme_field_ui_table(). + * Returns the region to which a row in the 'Manage fields' screen belongs. * - * @see theme_field_ui_table() + * This function is used as a #row_callback in field_ui_field_overview_form(), + * and is called during field_ui_table_pre_render(). */ -function template_preprocess_field_ui_table(&$variables) { - $elements = &$variables['elements']; +function field_ui_field_overview_row_region($row) { + switch ($row['#row_type']) { + case 'field': + case 'extra_field': + return 'main'; + case 'add_new_field': + // If no input in 'label', assume the row has not been dragged out of the + // 'add new' section. + return (!empty($row['label']['#value']) ? 'main' : 'add_new'); + } +} + +/** + * Returns the region to which a row in the 'Manage display' screen belongs. + * + * This function is used as a #row_callback in field_ui_field_overview_form(), + * and is called during field_ui_table_pre_render(). + */ +function field_ui_display_overview_row_region($row) { + switch ($row['#row_type']) { + case 'field': + case 'extra_field': + return ($row['format']['type']['#value'] == 'hidden' ? 'hidden' : 'visible'); + } +} + +/** + * Pre-render callback for field_ui_table elements. + */ +function field_ui_table_pre_render($elements) { + $regions = $elements['#regions']; + // @todo from the late template_preprocess_field_ui_display_overview_table() : + // used in a test + // $row->label_class = 'label-field'; + // used for messages ? + // $row->id = 'row-' . strtr($key, '_', '-'); // Build the tree structure from the weight and parenting data contained in // the flat form structure, to determine row order and indentation. $tree = array('' => array('name' => '', 'children' => array())); + $trees = array_fill_keys(array_keys($regions), $tree); + $parents = array(); $list = drupal_map_assoc(element_children($elements)); + // Iterate on rows until we can build a known tree path for all of them. while ($list) { foreach ($list as $name) { @@ -99,12 +137,16 @@ function template_preprocess_field_ui_table(&$variables) { $parent = $row['parent_wrapper']['parent']['#value']; // Proceed if parent is known. if (empty($parent) || isset($parents[$parent])) { - // Remove from the next iteration. + // Grab parent, and remove the row from the next iteration. $parents[$name] = $parent ? array_merge($parents[$parent], array($parent)) : array(); unset($list[$name]); + // Determine the region for the row. + $function = $row['#region_callback']; + $region_name = $function($row); + // Add the element in the tree. - $target = &$tree['']; + $target = &$trees[$region_name]['']; foreach ($parents[$name] as $key) { $target = &$target['children'][$key]; } @@ -118,9 +160,12 @@ function template_preprocess_field_ui_table(&$variables) { } } } + // Determine rendering order from the tree structure. + foreach ($regions as $region_name => $region) { + $elements['#regions'][$region_name]['rows_order'] = array_reduce($trees[$region_name], '_field_ui_reduce_order'); + } - // Determine rendering order for the tree. - $variables['row_order'] = array_reduce($tree, '_field_ui_reduce_order'); + return $elements; } /** @@ -137,25 +182,68 @@ function theme_field_ui_table($variables) { $elements = $variables['elements']; $table = array(); + // Add table headers and attributes. foreach (array('header', 'attributes') as $key) { if (isset($elements["#$key"])) { $table[$key] = $elements["#$key"]; } } - foreach ($variables['row_order'] as $key) { - $element = $elements[$key]; - $row = array('data' => array()); - $row += $element['#attributes']; + // Determine the colspan to use for region rows, by checking the number of + // columns in the headers. + $colums_count = 0; + foreach ($table['header'] as $header) { + $colums_count += (is_array($header) && isset($header['colspan']) ? $header['colspan'] : 1); + } - foreach (element_children($element) as $cell_key) { - $cell = array('data' => drupal_render($element[$cell_key])); - if (isset($element[$cell_key]['#cell_attributes'])) { - $cell += $element[$cell_key]['#cell_attributes']; + // Render rows, region by region. + foreach ($elements['#regions'] as $region_name => $region) { + // Add region rows. + $region_name_class = drupal_html_class($region_name); + if (isset($region['label'])) { + $table['rows'][] = array( + 'class' => array('region-title', 'region-' . $region_name_class . '-title'), + 'no_striping' => TRUE, + 'data' => array( + array('data' => $region['label'], 'colspan' => $colums_count), + ), + ); + } + if (isset($region['message'])) { + $class = (empty($region['rows_order']) ? 'region-empty' : 'region-populated'); + $table['rows'][] = array( + 'class' => array('region-message', 'region-' . $region_name_class . '-message', $class), + 'no_striping' => TRUE, + 'data' => array( + array('data' => $region['message'], 'colspan' => $colums_count), + ), + ); + } + + // Add form rows, in the order determined at pre-render time. + foreach ($region['rows_order'] as $key) { + $element = $elements[$key]; + + // Add classes needed for JS handling. + // @todo : group this in a JS settings array and assign through $.value() ? + $element['#attributes']['class'][] = 'row-name-' . drupal_html_class($key); + $element['#attributes']['class'][] = 'row-type-' . drupal_html_class($element['#row_type']); + $element['#attributes']['class'][] = 'row-region-' . $region_name_class; + + $row = array('data' => array()); + if (isset($element['#attributes'])) { + $row += $element['#attributes']; } - $row['data'][] = $cell; + + foreach (element_children($element) as $cell_key) { + $cell = array('data' => drupal_render($element[$cell_key])); + if (isset($element[$cell_key]['#cell_attributes'])) { + $cell += $element[$cell_key]['#cell_attributes']; + } + $row['data'][] = $cell; + } + $table['rows'][] = $row; } - $table['rows'][] = $row; } return theme('table', $table); @@ -184,9 +272,6 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle $extra_fields = field_info_extra_fields($entity_type, $bundle, 'form'); - // Store each default weight so that we can add the 'add new' rows after them. - $weights = array(); - $form += array( '#entity_type' => $entity_type, '#bundle' => $bundle, @@ -195,7 +280,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle ); $table = array( - '#type' => 'table', + '#type' => 'field_ui_table', '#tree' => TRUE, '#header' => array( t('Label'), @@ -206,7 +291,15 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle t('Widget'), array('data' => t('Operations'), 'colspan' => 2), ), - '#attributes' => array('id' => 'field-overview'), + '#parent_options' => array('' => t('')), + '#regions' => array( + 'main' => array(), + 'add_new' => array('label' => ' '), + ), + '#attributes' => array( + 'class' => array('field-ui-overview'), + 'id' => 'field-overview', + ), ); $parent_options = array('' => t('')); @@ -215,17 +308,16 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle foreach ($instances as $name => $instance) { $field = field_info_field($instance['field_name']); $admin_field_path = $admin_path . '/fields/' . $instance['field_name']; - $weight = $instance['widget']['weight']; - $weights[] = $weight; $table[$name] = array( - '#parents' => array($name), - '#attributes' => array('class' => array('draggable tabledrag-leaf')), + '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')), + '#row_type' => 'field', + '#region_callback' => 'field_ui_field_overview_row_region', 'label' => array( '#markup' => check_plain($instance['label']), ), 'weight' => array( '#type' => 'textfield', - '#default_value' => $weight, + '#default_value' => $instance['widget']['weight'], '#size' => 3, '#attributes' => array('class' => array('field-weight')), ), @@ -234,7 +326,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#type' => 'select', '#options' => $parent_options, '#attributes' => array('class' => array('field-parent')), - '#parents' => array($name, 'parent'), + '#parents' => array('fields', $name, 'parent'), ), 'hidden_name' => array( '#type' => 'hidden', @@ -280,17 +372,16 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle // Non-field elements. foreach ($extra_fields as $name => $extra_field) { - $weight = $extra_field['weight']; - $weights[] = $weight; $table[$name] = array( - '#parents' => array($name), - '#attributes' => array('class' => array('draggable', 'tabledrag-leaf', 'menu-disabled')), + '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')), + '#row_type' => 'extra_field', + '#region_callback' => 'field_ui_field_overview_row_region', 'label' => array( '#markup' => check_plain($extra_field['label']), ), 'weight' => array( '#type' => 'textfield', - '#default_value' => $weight, + '#default_value' => $extra_field['weight'], '#size' => 3, '#attributes' => array('class' => array('field-weight')), '#title_display' => 'invisible', @@ -301,7 +392,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#type' => 'select', '#options' => $parent_options, '#attributes' => array('class' => array('field-parent')), - '#parents' => array($name, 'parent'), + '#parents' => array('fields', $name, 'parent'), ), 'hidden_name' => array( '#type' => 'hidden', @@ -326,7 +417,6 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle } // Additional row: add new field. - $weight = !empty($weights) ? max($weights) + 1 : 0; $field_type_options = field_ui_field_type_options(); $widget_type_options = field_ui_widget_type_options(NULL, TRUE); if ($field_type_options && $widget_type_options) { @@ -334,8 +424,9 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle array_unshift($widget_type_options, t('- Select a widget -')); $name = '_add_new_field'; $table[$name] = array( - '#parents' => array($name), '#attributes' => array('class' => array('draggable', 'tabledrag-leaf', 'add-new')), + '#row_type' => 'add_new_field', + '#region_callback' => 'field_ui_field_overview_row_region', 'label' => array( '#type' => 'textfield', '#size' => 15, @@ -345,7 +436,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle ), 'weight' => array( '#type' => 'textfield', - '#default_value' => $weight, + '#default_value' => -1000, '#size' => 3, '#title_display' => 'invisible', '#title' => t('Weight for new field'), @@ -358,7 +449,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#options' => $parent_options, '#attributes' => array('class' => array('field-parent')), '#prefix' => '
 
', - '#parents' => array($name, 'parent'), + '#parents' => array('fields', $name, 'parent'), ), 'hidden_name' => array( '#type' => 'hidden', @@ -397,12 +488,12 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle // Additional row: add existing field. $existing_field_options = field_ui_existing_field_options($entity_type, $bundle); if ($existing_field_options && $widget_type_options) { - $weight++; array_unshift($existing_field_options, t('- Select an existing field -')); $name = '_add_existing_field'; $table[$name] = array( - '#parents' => array($name), '#attributes' => array('class' => array('draggable', 'tabledrag-leaf', 'add-new')), + '#row_type' => 'add_new_field', + '#region_callback' => 'field_ui_field_overview_row_region', 'label' => array( '#type' => 'textfield', '#size' => 15, @@ -413,7 +504,8 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle ), 'weight' => array( '#type' => 'textfield', - '#default_value' => $weight, + // @todo ? + '#default_value' => -1000, '#size' => 3, '#title_display' => 'invisible', '#title' => t('Weight for added field'), @@ -426,7 +518,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#options' => $parent_options, '#attributes' => array('class' => array('field-parent')), '#prefix' => '
 
', - '#parents' => array($name, 'parent'), + '#parents' => array('fields', $name, 'parent'), ), 'hidden_name' => array( '#type' => 'hidden', @@ -452,14 +544,14 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle ), ); } - - $form['table'] = $table; + $form['fields'] = $table; $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save')); $form['#attached']['css'][] = drupal_get_path('module', 'field_ui') . '/field_ui.css'; $form['#attached']['js'][] = drupal_get_path('module', 'field_ui') . '/field_ui.js'; + // Add settings for the update selects behavior. $js_fields = array(); foreach ($existing_field_options as $field_name => $fields) { @@ -495,18 +587,18 @@ function field_ui_field_overview_form_validate($form, &$form_state) { * Validate the 'add new field' row. */ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) { - $field = $form_state['values']['_add_new_field']; + $field = $form_state['values']['fields']['_add_new_field']; // Validate if any information was provided in the 'add new field' row. if (array_filter(array($field['label'], $field['field_name'], $field['type'], $field['widget_type']))) { // Missing label. if (!$field['label']) { - form_set_error('_add_new_field][label', t('Add new field: you need to provide a label.')); + form_set_error('fields][_add_new_field][label', t('Add new field: you need to provide a label.')); } // Missing field name. if (!$field['field_name']) { - form_set_error('_add_new_field][field_name', t('Add new field: you need to provide a field name.')); + form_set_error('fields][_add_new_field][field_name', t('Add new field: you need to provide a field name.')); } // Field name validation. else { @@ -515,39 +607,39 @@ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) { // Add the 'field_' prefix. if (substr($field_name, 0, 6) != 'field_') { $field_name = 'field_' . $field_name; - form_set_value($form['table']['_add_new_field']['field_name'], $field_name, $form_state); + form_set_value($form['fields']['_add_new_field']['field_name'], $field_name, $form_state); } // Invalid field name. if (!preg_match('!^field_[a-z0-9_]+$!', $field_name)) { - form_set_error('_add_new_field][field_name', t('Add new field: the field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.', array('%field_name' => $field_name))); + form_set_error('fields][_add_new_field][field_name', t('Add new field: the field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.', array('%field_name' => $field_name))); } if (strlen($field_name) > 32) { - form_set_error('_add_new_field][field_name', t("Add new field: the field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.", array('%field_name' => $field_name))); + form_set_error('fields][_add_new_field][field_name', t("Add new field: the field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.", array('%field_name' => $field_name))); } // Field name already exists. We need to check inactive fields as well, so // we can't use field_info_fields(). $fields = field_read_fields(array('field_name' => $field_name), array('include_inactive' => TRUE)); if ($fields) { - form_set_error('_add_new_field][field_name', t('Add new field: the field name %field_name already exists.', array('%field_name' => $field_name))); + form_set_error('fields][_add_new_field][field_name', t('Add new field: the field name %field_name already exists.', array('%field_name' => $field_name))); } } // Missing field type. if (!$field['type']) { - form_set_error('_add_new_field][type', t('Add new field: you need to select a field type.')); + form_set_error('fields][_add_new_field][type', t('Add new field: you need to select a field type.')); } // Missing widget type. if (!$field['widget_type']) { - form_set_error('_add_new_field][widget_type', t('Add new field: you need to select a widget.')); + form_set_error('fields][_add_new_field][widget_type', t('Add new field: you need to select a widget.')); } // Wrong widget type. elseif ($field['type']) { $widget_types = field_ui_widget_type_options($field['type']); if (!isset($widget_types[$field['widget_type']])) { - form_set_error('_add_new_field][widget_type', t('Add new field: invalid widget.')); + form_set_error('fields][_add_new_field][widget_type', t('Add new field: invalid widget.')); } } } @@ -561,30 +653,30 @@ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) { function _field_ui_field_overview_form_validate_add_existing($form, &$form_state) { // The form element might be absent if no existing fields can be added to // this bundle. - if (isset($form_state['values']['_add_existing_field'])) { - $field = $form_state['values']['_add_existing_field']; + if (isset($form_state['values']['fields']['_add_existing_field'])) { + $field = $form_state['values']['fields']['_add_existing_field']; // Validate if any information was provided in the 'add existing field' row. if (array_filter(array($field['label'], $field['field_name'], $field['widget_type']))) { // Missing label. if (!$field['label']) { - form_set_error('_add_existing_field][label', t('Add existing field: you need to provide a label.')); + form_set_error('fields][_add_existing_field][label', t('Add existing field: you need to provide a label.')); } // Missing existing field name. if (!$field['field_name']) { - form_set_error('_add_existing_field][field_name', t('Add existing field: you need to select a field.')); + form_set_error('fields][_add_existing_field][field_name', t('Add existing field: you need to select a field.')); } // Missing widget type. if (!$field['widget_type']) { - form_set_error('_add_existing_field][widget_type', t('Add existing field: you need to select a widget.')); + form_set_error('fields][_add_existing_field][widget_type', t('Add existing field: you need to select a widget.')); } // Wrong widget type. elseif ($field['field_name'] && ($existing_field = field_info_field($field['field_name']))) { $widget_types = field_ui_widget_type_options($existing_field['type']); if (!isset($widget_types[$field['widget_type']])) { - form_set_error('_add_existing_field][widget_type', t('Add existing field: invalid widget.')); + form_set_error('fields][_add_existing_field][widget_type', t('Add existing field: invalid widget.')); } } } @@ -595,7 +687,7 @@ function _field_ui_field_overview_form_validate_add_existing($form, &$form_state * Submit handler for the field overview form. */ function field_ui_field_overview_form_submit($form, &$form_state) { - $form_values = $form_state['values']; + $form_values = $form_state['values']['fields']; $entity_type = $form['#entity_type']; $bundle = $form['#bundle']; $admin_path = _field_ui_bundle_admin_path($entity_type, $bundle); @@ -721,14 +813,28 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund return $form; } - $form_state += array( - 'formatter_settings_edit' => NULL, - ); - $table = array( - '#theme' => 'field_ui_display_overview_table', - '#field_rows' => array(), + '#type' => 'field_ui_table', '#tree' => TRUE, + '#header' => array( + t('Field'), + t('Weight'), + t('Parent'), + t('Label'), + array('data' => t('Format'), 'colspan' => 3), + ), + '#regions' => array( + 'visible' => array('message' => t('No field is displayed.')), + 'hidden' => array('label' => t('Hidden'), 'message' => t('No field is hidden.')), + ), + '#parent_options' => array('' => t('')), + '#attributes' => array( + 'class' => array('field-ui-overview'), + 'id' => 'field-display-overview', + ), + // Add AJAX wrapper. + '#prefix' => '
', + '#suffix' => '
', ); $field_label_options = array( @@ -741,50 +847,72 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund 'hidden' => t('Hidden'), ); + // Field rows. foreach ($instances as $name => $instance) { + $field = field_info_field($instance['field_name']); $display = $instance['display'][$view_mode]; - $table[$name]['human_name'] = array( - '#markup' => check_plain($instance['label']), - ); - $table[$name]['weight'] = array( - '#type' => 'textfield', - '#default_value' => $display['weight'], - '#size' => 3, - ); - $table[$name]['hidden_name'] = array( - '#type' => 'hidden', - '#default_value' => $name, - ); - $table[$name]['label'] = array( - '#type' => 'select', - '#options' => $field_label_options, - '#default_value' => $display['label'], + $table[$name] = array( + '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')), + '#row_type' => 'field', + '#region_callback' => 'field_ui_display_overview_row_region', + 'human_name' => array( + '#markup' => check_plain($instance['label']), + ), + 'weight' => array( + '#type' => 'textfield', + '#default_value' => $display['weight'], + '#size' => 3, + '#attributes' => array('class' => array('field-weight')), + ), + 'parent_wrapper' => array( + 'parent' => array( + '#type' => 'select', + '#options' => $table['#parent_options'], + '#default_value' => '', + '#attributes' => array('class' => array('field-parent')), + '#parents' => array('fields', $name, 'parent'), + ), + 'hidden_name' => array( + '#type' => 'hidden', + '#default_value' => $name, + '#attributes' => array('class' => array('field-name')), + ), + ), + 'label' => array( + '#type' => 'select', + '#options' => $field_label_options, + '#default_value' => $display['label'], + ), ); - $field = field_info_field($instance['field_name']); // The handling of the 'hidden' region in field_ui.js relies on the // 'formatter type' select, so it is present in all cases, and hidden with // CSS when the row is in 'edit settings' mode. $formatter_options = field_ui_formatter_options($field['type']); $formatter_options['hidden'] = t(''); - $table[$name]['type'] = array( - '#type' => 'select', - '#options' => $formatter_options, - '#default_value' => $display['type'], - '#ajax' => array( - 'callback' => 'field_ui_formatter_settings_js', - 'wrapper' => 'field-display-overview-wrapper', - 'effect' => 'fade', + $table[$name]['format'] = array( + 'type' => array( + '#type' => 'select', + '#options' => $formatter_options, + '#default_value' => $display['type'], +// '#ajax' => array( +// 'callback' => 'field_ui_formatter_settings_js', +// 'wrapper' => 'field-display-overview-wrapper', +// 'effect' => 'fade', +// ), + '#parents' => array('fields', $name, 'type'), + '#attributes' => array('class' => array('field-formatter-type')), +// '#field_name' => $name, +// '#op' => 'change_type', ), - '#field_name' => $name, - '#op' => 'change_type', + 'settings_edit_form' => array(), ); // Formatter settings. // Check the currently selected formatter, and merge persisted values for // formatter settings. - if (isset($form_state['values']['settings'][$name]['type'])) { - $formatter_type = $form_state['values']['settings'][$name]['type']; + if (isset($form_state['values']['fields'][$name]['type'])) { + $formatter_type = $form_state['values']['fields'][$name]['type']; } else { $formatter_type = $display['type']; @@ -813,41 +941,45 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund '#field_name' => $name, ); - if ($form_state['formatter_settings_edit'] == $name) { + if (isset($form_state['formatter_settings_edit']) && $form_state['formatter_settings_edit'] == $name) { // We are currently editing this field's formatter settings. Display the // settings form and submit buttons. $table[$name]['settings_edit_form'] = array(); $function = $formatter['module'] . '_field_formatter_settings_form'; $additions = $function($field, $instance, $view_mode, $form, $form_state); if (is_array($additions)) { - $table[$name]['settings_edit_form'] = array( + $table[$name]['format']['#cell_attributes'] = array('colspan' => 3); + $table[$name]['format']['settings_edit_form'] = array( '#type' => 'container', '#attributes' => array('class' => array('field-formatter-settings-edit-form')), + '#parents' => array('fields', $name, 'settings_edit_form'), + 'label' => array( + '#markup' => t('Format settings:') . ' ' . $formatter['label'] . '', + ), + 'settings' => $additions, + 'actions' => array( + '#type' => 'actions', + 'save_settings' => $base_button + array( + '#type' => 'submit', + '#name' => $name . '_formatter_settings_update', + '#value' => t('Update'), + '#op' => 'update', + ), + 'cancel_settings' => $base_button + array( + '#type' => 'submit', + '#name' => $name . '_formatter_settings_cancel', + '#value' => t('Cancel'), + '#op' => 'cancel', + // Do not check errors for the 'Cancel' button. + '#limit_validation_errors' => array(), + ), + ), ); - $table[$name]['settings_edit_form']['label'] = array( - '#markup' => t('Format settings:') . ' ' . $formatter['label'] . '', - ); - $table[$name]['settings_edit_form']['settings'] = $additions; - $table[$name]['settings_edit_form']['actions'] = array('#type' => 'actions'); - $table[$name]['settings_edit_form']['actions']['save_settings'] = $base_button + array( - '#type' => 'submit', - '#name' => $name . '_formatter_settings_update', - '#value' => t('Update'), - '#op' => 'update', - ); - $table[$name]['settings_edit_form']['actions']['cancel_settings'] = $base_button + array( - '#type' => 'submit', - '#name' => $name . '_formatter_settings_cancel', - '#value' => t('Cancel'), - '#op' => 'cancel', - // Do not check errors for the 'Cancel' button. - '#limit_validation_errors' => array(), - ); - $table[$name]['#settings_editing'] = TRUE; + $table[$name]['#attributes']['class'][] = 'field-formatter-settings-editing'; // When formatter is changed, cancel the currently edited settings. The // select 'formatter type' input is hidden in editing mode, so this only // happens is the row is dragged into the 'hidden' section. - $table[$name]['type']['#ajax']['trigger_as'] = array('name' => $name . '_formatter_settings_cancel'); + $table[$name]['format']['type']['#ajax']['trigger_as'] = array('name' => $name . '_formatter_settings_cancel'); } } else { @@ -858,6 +990,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund if ($summary) { $table[$name]['settings_summary'] = array( '#markup' => '
' . $summary . '
', + '#cell_attributes' => array('class' => array('field-formatter-summary-cell')), ); $table[$name]['settings_edit'] = $base_button + array( '#type' => 'image_button', @@ -872,7 +1005,6 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund ); } } - $table['#field_rows'][] = $name; // Collect default formatters for the JS script. $field_type_info = field_info_field_types($field['type']); @@ -880,31 +1012,47 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund } // Non-field elements. + // @todo test with poll... foreach ($extra_fields as $name => $extra_field) { $display = $extra_field['display'][$view_mode]; - $table[$name]['human_name'] = array( - '#markup' => check_plain($extra_field['label']), - ); - $table[$name]['weight'] = array( - '#type' => 'textfield', - '#default_value' => $display['weight'], - '#size' => 3, - ); - $table[$name]['hidden_name'] = array( - '#type' => 'hidden', - '#default_value' => $name, - ); - $table[$name]['type'] = array( - '#type' => 'select', - '#options' => $extra_visibility_options, - '#default_value' => $display['visible'] ? 'visible' : 'hidden', + $table[$name] = array( + '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')), + '#row_type' => 'extra_field', + '#region_callback' => 'field_ui_display_overview_row_region', + 'human_name' => array( + '#markup' => check_plain($extra_field['label']), + ), + 'weight' => array( + '#type' => 'textfield', + '#default_value' => $display['weight'], + '#size' => 3, + '#attributes' => array('class' => array('field-weight')), + ), + 'parent_wrapper' => array( + 'parent' => array( + '#type' => 'select', + '#options' => $table['#parent_options'], + '#default_value' => '', + '#attributes' => array('class' => array('field-parent')), + '#parents' => array('fields', $name, 'parent'), + ), + 'hidden_name' => array( + '#type' => 'hidden', + '#default_value' => $name, + '#attributes' => array('class' => array('field-name')), + ), + ), + 'type' => array( + '#type' => 'select', + '#options' => $extra_visibility_options, + '#default_value' => $display['visible'] ? 'visible' : 'hidden', + ), + 'settings_summary' => array(), + 'settings_edit' => array(), ); - $table[$name]['settings_summary'] = array(); - $table[$name]['settings_edit'] = array(); - $table['#field_rows'][] = $name; } - $form['settings'] = $table; + $form['fields'] = $table; // Custom display settings. if ($view_mode == 'default') { @@ -935,14 +1083,31 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund ); } + // Hidden element used by field_ui.js to track dragged rows. + $form['dragged_rows'] = array('#type' => 'hidden'); + $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save')); - + $form['actions']['refresh'] = $base_button + array( + '#type' => 'submit', + '#value' => t('Refresh'), + '#name' => 'refresh', + '#op' => 'refresh', + // Do not check errors. + '#limit_validation_errors' => array(), + ); $form['#attached']['js'][] = drupal_get_path('module', 'field_ui') . '/field_ui.js'; $form['#attached']['css'][] = drupal_get_path('module', 'field_ui') . '/field_ui.css'; drupal_add_js(array('fieldDefaultFormatters' => $default_formatters), 'setting'); + // Add tabledrag behavior. + // @todo : is not caught on AJAX update - known bug... + drupal_add_tabledrag('field-display-overview', 'order', 'sibling', 'field-weight'); + drupal_add_tabledrag('field-display-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name'); +// $form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'order', 'sibling', 'field-weight'); +// $form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name'); + return $form; } @@ -952,23 +1117,24 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund */ function field_ui_formatter_settings_submit($form, &$form_state) { $trigger = $form_state['triggering_element']; - $field_name = $trigger['#field_name']; $op = $trigger['#op']; switch ($op) { case 'edit': // Store the field whose settings are currently being edited. + $field_name = $trigger['#field_name']; $form_state['formatter_settings_edit'] = $field_name; break; case 'update': // Store the saved settings. - $values = $form_state['values']['settings'][$field_name]['settings_edit_form']['settings']; + $field_name = $trigger['#field_name']; + $values = $form_state['values']['fields'][$field_name]['settings_edit_form']['settings']; $form_state['formatter_settings'][$field_name] = $values; // Fall-through to the 'cancel' case. case 'cancel': // Unset the field as being currently edited. - $form_state['formatter_settings_edit'] = NULL; + unset($form_state['formatter_settings_edit']); break; } @@ -980,75 +1146,40 @@ function field_ui_formatter_settings_submit($form, &$form_state) { */ function field_ui_formatter_settings_js($form, &$form_state) { $trigger = $form_state['triggering_element']; - $field_name = $trigger['#field_name']; $op = $trigger['#op']; // Apply the AJAX effect to updated elements. switch ($op) { - case 'change_type': - $updated = array('settings_summary'); +// case 'change_type': +// $updated = array('settings_summary'); +// break; + + case 'refresh': + $updated_fields = explode(' ', $form_state['values']['dragged_rows']); + $updated_columns = array('format', 'settings_summary', 'settings_edit'); break; case 'edit': - $updated = array('settings_edit_form'); + $updated_fields = array($trigger['#field_name']); + $updated_columns = array('format'); break; case 'update': case 'cancel': - $updated = array('type', 'settings_summary', 'settings_edit'); + $updated_fields = array($trigger['#field_name']); + $updated_columns = array('format', 'settings_summary', 'settings_edit'); break; } - foreach ($updated as $key) { - $element = &$form['settings'][$field_name][$key]; - $element['#prefix'] = '
' . (isset($element['#prefix']) ? $element['#prefix'] : ''); - $element['#suffix'] = (isset($element['#suffix']) ? $element['#suffix'] : '') . '
'; - } - return $form['settings']; -} - -/** - * Theme preprocess function for field_ui-display-overview-table.tpl.php. - */ -function template_preprocess_field_ui_display_overview_table(&$vars) { - $elements = &$vars['elements']; - - $rows = array( - 'visible' => array(), - 'hidden' => array(), - ); - - if (!empty($elements['#field_rows'])) { - drupal_add_tabledrag('field-display-overview', 'order', 'sibling', 'field-weight'); - - $order = _field_ui_overview_order($elements, $elements['#field_rows']); - foreach ($order as $key) { - $element = &$elements[$key]; - $visibility = $element['type']['#value'] == 'hidden' ? 'hidden' : 'visible'; - - // Add target classes for the tabledrag behavior. - $element['weight']['#attributes']['class'][] = 'field-weight'; - $element['hidden_name']['#attributes']['class'][] = 'field-name'; - $element['type']['#attributes']['class'][] = 'field-formatter-type'; - $element['type']['#attributes']['class'][] = "field-display-$visibility"; - $element['type']['#attributes']['class'][] = "field-name-$key"; - - $row = new stdClass(); - foreach (element_children($element) as $child) { - $row->{$child} = drupal_render($element[$child]); - } - $row->settings_class = (!empty($element['#settings_class']) ? $element['#settings_class'] : ''); - $row->class = 'draggable'; - if (isset($element['#settings_editing'])) { - $row->class .= ' field-formatter-settings-editing'; - } - $row->label_class = 'label-field'; - $row->id = 'row-' . strtr($key, '_', '-'); - $rows[$visibility][] = $row; + foreach ($updated_fields as $field_name) { + foreach ($updated_columns as $key) { + $element = &$form['fields'][$field_name][$key]; + $element['#prefix'] = '
' . (isset($element['#prefix']) ? $element['#prefix'] : ''); + $element['#suffix'] = (isset($element['#suffix']) ? $element['#suffix'] : '') . '
'; } } - $vars['rows'] = $rows; + return $form['fields']; } /** @@ -1063,7 +1194,7 @@ function field_ui_display_overview_form_submit($form, &$form_state) { // Save data for 'regular' fields. foreach ($form['#fields'] as $field_name) { $instance = field_info_instance($entity_type, $field_name, $bundle); - $values = $form_values['settings'][$field_name]; + $values = $form_values['fields'][$field_name]; // Get formatter settings. They lie either directly in submitted form // values (if the whole form was submitted while some formatter // settings were being edited), or have been persisted in @@ -1095,8 +1226,8 @@ function field_ui_display_overview_form_submit($form, &$form_state) { // Save data for 'extra' fields. foreach ($form['#extra'] as $name) { $bundle_settings['extra_fields']['display'][$name][$view_mode] = array( - 'weight' => $form_values['settings'][$name]['weight'], - 'visible' => $form_values['settings'][$name]['type'] == 'visible', + 'weight' => $form_values['fields'][$name]['weight'], + 'visible' => $form_values['fields'][$name]['type'] == 'visible', ); } @@ -1735,25 +1866,6 @@ function field_ui_next_destination($entity_type, $bundle) { } /** - * Helper function to order fields when theming overview forms. - * @todo Remove when 'Manage display' screen is done. - */ -function _field_ui_overview_order(&$form, $field_rows) { - // Put weight and parenting values into a $dummy render structure and let - // drupal_render() figure out the corresponding row order. - $dummy = array(); - // Field rows: account for weight. - foreach ($field_rows as $name) { - $dummy[$name] = array( - '#markup' => $name . ' ', - '#type' => 'markup', - '#weight' => $form[$name]['weight']['#value'], - ); - } - return $dummy ? explode(' ', trim(drupal_render($dummy))) : array(); -} - -/** * Helper form element validator: integer. */ function _element_validate_integer($element, &$form_state) { diff --git modules/field_ui/field_ui.css modules/field_ui/field_ui.css index c35190a..2ab2086 100644 --- modules/field_ui/field_ui.css +++ modules/field_ui/field_ui.css @@ -1,51 +1,60 @@ /* $Id: field_ui.css,v 1.4 2010/07/17 19:19:39 dries Exp $ */ -/* 'Manage fields' overview */ -#field-overview tr.add-new .label-input { +/* 'Manage fields' and 'Manage display' overviews */ +table.field-ui-overview tr.add-new .label-input { float: left; /* LTR */ } -#field-overview tr.add-new .tabledrag-changed { +table.field-ui-overview tr.add-new .tabledrag-changed { display: none; } -#field-overview tr.add-new .description { +table.field-ui-overview tr.add-new .description { margin-bottom: 0; } -#field-overview tr.add-new .add-new-placeholder { +table.field-ui-overview tr.add-new .add-new-placeholder { font-weight: bold; padding-bottom: .5em; } +table.field-ui-overview tr.region-add-new-title { + display: none; +} /* 'Manage display' overview */ -.field-display-overview tr.region-title td { +#field-display-overview tr.region-title td { font-weight: bold; } -.field-display-overview tr.region-populated { +#field-display-overview tr.region-message td { + font-style: italic; +} +#field-display-overview tr.region-populated { display: none; } -.field-display-overview .field-formatter-summary-cell { +#field-display-overview .field-formatter-summary-cell { line-height: 1em; } -.field-display-overview .field-formatter-summary { +#field-display-overview .field-formatter-summary { float: left; font-size: 0.9em; } -.field-display-overview td.field-formatter-summary-cell span.warning { +#field-display-overview td.field-formatter-summary-cell span.warning { display: block; float: left; margin-right: .5em; } -.field-display-overview .field-formatter-settings-edit-wrapper { +#field-display-overview .field-formatter-settings-edit-wrapper { float: right; } -.field-display-overview .field-formatter-settings-edit { +#field-display-overview .field-formatter-settings-edit { float: right; } -.field-display-overview tr.field-formatter-settings-editing td { +#field-display-overview tr.field-formatter-settings-editing td { vertical-align: top; } -.field-display-overview tr.field-formatter-settings-editing .field-formatter-type { +#field-display-overview tr.field-formatter-settings-editing .field-formatter-type { display: none; } -.field-display-overview .field-formatter-settings-edit-form .formatter-name{ +#field-display-overview .field-formatter-settings-edit-form .formatter-name{ font-weight: bold; -} \ No newline at end of file +} +#field-ui-display-overview-form #edit-refresh { + display:none; +} diff --git modules/field_ui/field_ui.js modules/field_ui/field_ui.js index dff02b8..ad7d36a 100644 --- modules/field_ui/field_ui.js +++ modules/field_ui/field_ui.js @@ -4,6 +4,10 @@ Drupal.behaviors.fieldManageFields = { attach: function (context) { + // Only run on the 'Manage fields' screen. + if (!$('table#field-overview', context).length) { + return; + } attachUpdateSelects(context); } }; @@ -82,15 +86,16 @@ jQuery.fn.fieldPopulateOptions = function (options, selected) { }; /** - * Moves a field in the display settings table from visible to hidden. + * @todo Moves a field in the display settings table from visible to hidden. * * This behavior is dependent on the tableDrag behavior, since it uses the * objects initialized in that behavior to update the row. */ Drupal.behaviors.fieldManageDisplayDrag = { attach: function (context, settings) { + // tableDrag is required for this behavior. - if (!$('table.field-display-overview', context).length || typeof Drupal.tableDrag == 'undefined') { + if (!$('table#field-display-overview', context).length || typeof Drupal.tableDrag == 'undefined') { return; } @@ -106,61 +111,61 @@ Drupal.behaviors.fieldManageDisplayDrag = { // or out of the 'Hidden' section. tableDrag.onDrop = function () { var dragObject = this; - var regionRow = $(dragObject.rowObject.element).prevAll('tr.region-message').get(0); - var visibility = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); + var row = dragObject.rowObject.element; + var rowType = row.className.replace(/([^ ]+[ ]+)*row-type-([^ ]+)([ ]+[^ ]+)*/, '$2'); + var oldRegion = row.className.replace(/([^ ]+[ ]+)*row-region-([^ ]+)([ ]+[^ ]+)*/, '$2'); + var regionRow = $(row).prevAll('tr.region-message').get(0); + var region = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); // Update the 'format' selector if the visibility changed. - var $select = $('select.field-formatter-type', dragObject.rowObject.element); - var oldVisibility = $select[0].className.replace(/([^ ]+[ ]+)*field-display-([^ ]+)([ ]+[^ ]+)*/, '$2'); - if (visibility != oldVisibility) { - $select.removeClass('field-display-' + oldVisibility).addClass('field-display-' + visibility); - - // Update the selected formatter if coming from an actual drag. - if (!$select.data('noUpdate')) { - if (visibility == 'visible') { - // Restore the formatter back to the previously selected one if - // available, or to the default formatter. - var value = $select.data('oldFormatter'); - if (typeof value == 'undefined') { - // Extract field name from the name of the select. - var fieldName = $select[0].className.match(/\bfield-name-(\S+)\b/)[1].replace('-', '_'); + if (region != oldRegion) { + // Operate on all rows in the dragged group. + var rows = []; + $.each(dragObject.rowObject.group, function (index, groupRow) { + var rowName = groupRow.className.match(/\brow-name-(\S+)\b/)[1].replace('-', '_'); + rows.push(rowName); + // @todo using class name field-formatter-type is not cool... + var $select = $('select.field-formatter-type', groupRow); + $select.removeClass('row-region-' + oldRegion).addClass('row-region-' + region); + // Update the selected formatter if coming from an actual drag. + // @todo check noupdate... + if (!$select.data('noUpdate')) { + if (region == 'visible') { + // Restore the formatter back to the default formatter. + // Pseudo-fields do not have an entry in the defaultFormatters // array, we just return to 'visible' for those. - value = (fieldName in defaultFormatters) ? defaultFormatters[fieldName] : 'visible'; + var value = (rowName in defaultFormatters) ? defaultFormatters[rowName] : 'visible'; } - $select.data('oldFormatter', value); - } - else { - var value = 'hidden'; + else { + var value = 'hidden'; + } + // Change value. + $select.val(value); } - $select.val(value); - // Fire AJAX update of formatter settings. - $select.change(); - } - $select.removeData('noUpdate'); + $select.removeData('noUpdate'); + }); + // @todo comment + $('input[name=dragged_rows]').val(rows.join(' ')); + // Trigger Ajax-update. + $('input#edit-refresh').mousedown(); } }; // Add the behavior to each formatter select list. $('select.field-formatter-type', context).once('field-formatter-type', function () { - // Initialize 'previously selected formatter' as the incoming value. - if ($(this).val() != 'hidden') { - $(this).data('oldFormatter', $(this).val()); - } - // Add change listener. $(this).change(function (event) { var $select = $(this); var value = $select.val(); - - // Keep track of the last selected formatter. - if (value != 'hidden') { - $select.data('oldFormatter', value); - } - var visibility = (value == 'hidden') ? 'hidden' : 'visible'; - var oldVisibility = $select[0].className.replace(/([^ ]+[ ]+)*field-display-([^ ]+)([ ]+[^ ]+)*/, '$2'); + // @todo check + var oldVisibility = $select.parents('tr').get(0).className.replace(/([^ ]+[ ]+)*row-region-([^ ]+)([ ]+[^ ]+)*/, '$2'); + if (visibility != oldVisibility) { + // @todo : fix indent when setting an individual field in a group to hidden + // @todo : need to do this on group rows too... + // Prevent the onDrop handler from overriding the selected option. $select.data('noUpdate', true); @@ -171,16 +176,26 @@ Drupal.behaviors.fieldManageDisplayDrag = { tableDrag.rowObject = new tableDrag.row($row); // Move the row at the bottom of the new section. + // @todo looks broken with region message if (visibility == 'hidden') { + // @todo : doesn't work with the 'add_new' region. $('tr:last', tableDrag.table).after($row); } else { $('tr.region-title-hidden', tableDrag.table).before($row); } + // Remove indentations. + // @todo doesn't work - this.indents is not defined + // new tableDrag.row() is missing arguments above ? + tableDrag.rowObject.indent(0); + + // @todo : adjust parent ? + // Manually update weights and restripe. tableDrag.updateFields($row.get(0)); tableDrag.rowObject.changed = true; + if (tableDrag.oldRowElement) { $(tableDrag.oldRowElement).removeClass('drag-previous'); } @@ -193,7 +208,6 @@ Drupal.behaviors.fieldManageDisplayDrag = { // Modify empty regions with added or removed fields. checkEmptyRegions($table, tableDrag.rowObject); } - // Remove focus from selectbox. $select.get(0).blur(); }); @@ -203,7 +217,7 @@ Drupal.behaviors.fieldManageDisplayDrag = { $('tr.region-message', $table).each(function () { // If the dragged row is in this region, but above the message row, swap // it down one space. - if ($(this).prev('tr').get(0) == rowObject.element) { + if ($(this).prev('tr').get(0) == rowObject.group[rowObject.group.length - 1]) { // Prevent a recursion problem when using the keyboard to move rows up. if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) { rowObject.swap('after', this); diff --git modules/field_ui/field_ui.module modules/field_ui/field_ui.module index c3f3296..251c9fc 100644 --- modules/field_ui/field_ui.module +++ modules/field_ui/field_ui.module @@ -275,11 +275,6 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc */ function field_ui_theme() { return array( - 'field_ui_display_overview_table' => array( - 'render element' => 'elements', - 'file' => 'field_ui.admin.inc', - 'template' => 'field_ui-display-overview-table', - ), 'field_ui_table' => array( 'render element' => 'elements', ), @@ -291,8 +286,10 @@ function field_ui_theme() { */ function field_ui_element_info() { return array( - 'table' => array( + 'field_ui_table' => array( '#theme' => 'field_ui_table', + '#pre_render' => array('field_ui_table_pre_render'), + '#regions' => array('' => array()), ), ); } diff --git modules/field_ui/field_ui.test modules/field_ui/field_ui.test index 6b4d1ca..d16667f 100644 --- modules/field_ui/field_ui.test +++ modules/field_ui/field_ui.test @@ -85,8 +85,8 @@ class FieldUITestCase extends DrupalWebTestCase { function createField() { // Create a test field. $edit = array( - '_add_new_field[label]' => $this->field_label, - '_add_new_field[field_name]' => $this->field_name_input, + 'fields[_add_new_field][label]' => $this->field_label, + 'fields[_add_new_field][field_name]' => $this->field_name_input, ); $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->hyphen_type, $edit); @@ -95,7 +95,7 @@ class FieldUITestCase extends DrupalWebTestCase { // should also appear in the 'taxonomy term' entity. $vocabulary = taxonomy_vocabulary_load(1); $this->drupalGet('admin/structure/taxonomy/' . $vocabulary->machine_name . '/fields'); - $this->assertTrue($this->xpath('//select[@name="_add_existing_field[field_name]"]//option[@value="' . $this->field_name . '"]'), t('Existing field was found in account settings.')); + $this->assertTrue($this->xpath('//select[@name="fields[_add_existing_field][field_name]"]//option[@value="' . $this->field_name . '"]'), t('Existing field was found in account settings.')); } /** @@ -136,8 +136,8 @@ class FieldUITestCase extends DrupalWebTestCase { // Add a new field based on an existing field. $edit = array( - '_add_existing_field[label]' => $this->field_label . '_2', - '_add_existing_field[field_name]' => $this->field_name, + 'fields[_add_existing_field][label]' => $this->field_label . '_2', + 'fields[_add_existing_field][field_name]' => $this->field_name, ); $this->fieldUIAddExistingField("admin/structure/types/manage/page", $edit); } @@ -224,8 +224,8 @@ class FieldUITestCase extends DrupalWebTestCase { // Create a new field. $bundle_path1 = 'admin/structure/types/manage/' . $this->hyphen_type; $edit1 = array( - '_add_new_field[label]' => $this->field_label, - '_add_new_field[field_name]' => $this->field_name, + 'fields[_add_new_field][label]' => $this->field_label, + 'fields[_add_new_field][field_name]' => $this->field_name, ); $this->fieldUIAddNewField($bundle_path1, $edit1); @@ -238,8 +238,8 @@ class FieldUITestCase extends DrupalWebTestCase { // Add an instance to the second node type. $bundle_path2 = 'admin/structure/types/manage/' . $hyphen_type2; $edit2 = array( - '_add_existing_field[label]' => $this->field_label, - '_add_existing_field[field_name]' => $this->field_name, + 'fields[_add_existing_field][label]' => $this->field_label, + 'fields[_add_existing_field][field_name]' => $this->field_name, ); $this->fieldUIAddExistingField($bundle_path2, $edit2); @@ -317,11 +317,11 @@ class FieldUITestCase extends DrupalWebTestCase { function fieldUIAddNewField($bundle_path, $initial_edit, $field_edit = array(), $instance_edit = array()) { // Use 'test_field' field type by default. $initial_edit += array( - '_add_new_field[type]' => 'test_field', - '_add_new_field[widget_type]' => 'test_field_widget', + 'fields[_add_new_field][type]' => 'test_field', + 'fields[_add_new_field][widget_type]' => 'test_field_widget', ); - $label = $initial_edit['_add_new_field[label]']; - $field_name = $initial_edit['_add_new_field[field_name]']; + $label = $initial_edit['fields[_add_new_field][label]']; + $field_name = $initial_edit['fields[_add_new_field][field_name]']; // First step : 'Add new field' on the 'Manage fields' page. $this->drupalPost("$bundle_path/fields", $initial_edit, t('Save')); @@ -357,10 +357,10 @@ class FieldUITestCase extends DrupalWebTestCase { function fieldUIAddExistingField($bundle_path, $initial_edit, $instance_edit = array()) { // Use 'test_field_widget' by default. $initial_edit += array( - '_add_existing_field[widget_type]' => 'test_field_widget', + 'fields[_add_existing_field][widget_type]' => 'test_field_widget', ); - $label = $initial_edit['_add_existing_field[label]']; - $field_name = $initial_edit['_add_existing_field[field_name]']; + $label = $initial_edit['fields[_add_existing_field][label]']; + $field_name = $initial_edit['fields[_add_existing_field][field_name]']; // First step : 'Add existing field' on the 'Manage fields' page. $this->drupalPost("$bundle_path/fields", $initial_edit, t('Save')); diff --git modules/file/tests/file.test modules/file/tests/file.test index 7c9d643..7a8757c 100644 --- modules/file/tests/file.test +++ modules/file/tests/file.test @@ -316,10 +316,10 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { // Create a new field. $edit = array( - '_add_new_field[label]' => $label = $this->randomName(), - '_add_new_field[field_name]' => $name = strtolower($this->randomName()), - '_add_new_field[type]' => 'file', - '_add_new_field[widget_type]' => 'file_generic', + 'fields[_add_new_field][label]' => $label = $this->randomName(), + 'fields[_add_new_field][field_name]' => $name = strtolower($this->randomName()), + 'fields[_add_new_field][type]' => 'file', + 'fields[_add_new_field][widget_type]' => 'file_generic', ); $this->drupalPost('admin/structure/types/manage/article/comment/fields', $edit, t('Save')); $edit = array('field[settings][uri_scheme]' => 'private'); diff --git modules/image/image.field.inc modules/image/image.field.inc index 6c0a255..602f105 100644 --- modules/image/image.field.inc +++ modules/image/image.field.inc @@ -435,7 +435,7 @@ function image_field_formatter_info() { 'image' => array( 'label' => t('Image'), 'field types' => array('image'), - 'settings' => array('image_style' => '', 'image_link' => ''), + 'settings' => array('image_style' => '', 'image_link' => '', 'setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ), ); diff --git themes/seven/style.css themes/seven/style.css index 96fe6b9..a6e3238 100644 --- themes/seven/style.css +++ themes/seven/style.css @@ -960,23 +960,23 @@ div.add-or-remove-shortcuts { /* Field UI */ -.field-display-overview input.field-formatter-settings-edit { +#field-display-overview input.field-formatter-settings-edit { margin: 0; padding: 1px 8px; } -.field-display-overview tr.field-formatter-settings-changed { +#field-display-overview tr.field-formatter-settings-changed { background: #FFFFBB; } -.field-display-overview tr.drag { +#field-display-overview tr.drag { background: #FFEE77; } -.field-display-overview tr.field-formatter-settings-editing { +#field-display-overview tr.field-formatter-settings-editing { background: #D5E9F2; } -.field-display-overview .field-formatter-settings-edit-form .form-item { +#field-display-overview .field-formatter-settings-edit-form .form-item { margin: 10px 0; } -.field-display-overview .field-formatter-settings-edit-form .form-submit { +#field-display-overview .field-formatter-settings-edit-form .form-submit { margin-bottom: 0; }