diff --git includes/theme.inc includes/theme.inc index 79fbecd..9b52310 100644 --- includes/theme.inc +++ includes/theme.inc @@ -1614,6 +1614,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']; @@ -1728,8 +1729,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 .= ' '; @@ -1999,7 +2002,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 be0ad63..b346b73 100644 --- misc/tabledrag.js +++ misc/tabledrag.js @@ -1010,14 +1010,17 @@ Drupal.tableDrag.prototype.row.prototype.swap = function (position, row) { */ Drupal.tableDrag.prototype.row.prototype.validIndentInterval = function (prevRow, nextRow) { var minIndent, maxIndent; - + // Minimum indentation: // Do not orphan the next row. 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 2a3604c..381d79e 100644 --- modules/field/modules/text/text.module +++ modules/field/modules/text/text.module @@ -251,6 +251,7 @@ function text_field_formatter_info() { 'text_trimmed' => array( 'label' => t('Trimmed'), 'field types' => array('text', 'text_long', 'text_with_summary'), + 'settings' => array('trim_length' => 600), ), // The 'summary or trimmed' field formatter for text_with_summary @@ -260,11 +261,51 @@ function text_field_formatter_info() { 'text_summary_or_trimmed' => array( 'label' => t('Summary or trimmed'), 'field types' => array('text_with_summary'), + 'settings' => array('trim_length' => 600), ), ); } /** + * Implements hook_field_formatter_settings_form(). + */ +function text_field_formatter_settings_form($field, $instance, $view_mode) { + $display = $instance['display'][$view_mode]; + $settings = $display['settings']; + + $form = array(); + + if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') { + $form['trim_length'] = array( + '#title' => t('Length'), + '#type' => 'textfield', + '#size' => 20, + '#default_value' => $settings['trim_length'], + '#element_validate' => array('_element_validate_integer_positive'), + '#required' => TRUE, + ); + } + + return $form; +} + +/** + * Implements hook_field_formatter_settings_summary(). + */ +function text_field_formatter_settings_summary($field, $instance, $view_mode) { + $display = $instance['display'][$view_mode]; + $settings = $display['settings']; + + $summary = ''; + + if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') { + $summary = t('Length: @length characters', array('@length' => $settings['trim_length'])); + } + + return $summary; +} + +/** * Implements hook_field_formatter_view(). */ function text_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { 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.admin.inc modules/field_ui/field_ui.admin.inc index a20b546..b767b79 100644 --- modules/field_ui/field_ui.admin.inc +++ modules/field_ui/field_ui.admin.inc @@ -80,18 +80,26 @@ function _field_ui_reduce_order($array, $a) { } /** - * Theme preprocess function for theme_field_ui_table(). - * - * @see theme_field_ui_table() + * Pre-render callback for field_ui_table elements. */ -function template_preprocess_field_ui_table(&$variables) { - $elements = &$variables['elements']; +function field_ui_table_pre_render($elements) { + $regions = $elements['#regions']; + + // @todo JS - when a group is dragged in / out of region, update visibility. + // @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 +107,22 @@ 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 which the row belongs to. + // @todo Not great... + if (isset($row['format']['type'])) { + $region_name = ($row['format']['type']['#value'] == 'hidden' ? 'hidden' : 'visible'); + } + else { + $region_name = key($regions); + } + $row['#attributes']['class'][] = 'field-display-' . $region_name; + // Add the element in the tree. - $target = &$tree['']; + $target = &$trees[$region_name]['']; foreach ($parents[$name] as $key) { $target = &$target['children'][$key]; } @@ -119,8 +137,12 @@ function template_preprocess_field_ui_table(&$variables) { } } - // Determine rendering order for the tree. - $variables['row_order'] = array_reduce($tree, '_field_ui_reduce_order'); + // 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'); + } + + return $elements; } /** @@ -143,19 +165,50 @@ function theme_field_ui_table($variables) { } } - 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 first row. + $key = current(element_children($elements, FALSE)); + $colums_count = count(element_children($elements[$key], FALSE)); - 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']; + foreach ($elements['#regions'] as $region_name => $region) { + // Add region rows. + if (isset($region['label'])) { + $table['rows'][] = array( + 'class' => array('region-title', 'region-title-hidden'), + 'no_striping' => TRUE, + 'data' => array( + array('colspan' => $colums_count, 'data' => $region['label']), + ), + ); + } + if (isset($region['message'])) { + $class = (empty($region['rows_order']) ? 'region-empty' : 'region-populated'); + $table['rows'][] = array( + 'class' => array('region-message', 'region-' . $region_name . '-message', $class), + 'no_striping' => TRUE, + 'data' => array( + array('colspan' => $colums_count, 'data' => $region['message']), + ), + ); + } + + // Add form rows, in the order determined at pre-render time. + foreach ($region['rows_order'] as $key) { + $element = $elements[$key]; + $row = array('data' => array()); + if (isset($element['#attributes'])) { + $row += $element['#attributes']; + } + + 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; } - $row['data'][] = $cell; + $table['rows'][] = $row; } - $table['rows'][] = $row; } return theme('table', $table); @@ -195,7 +248,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'), @@ -219,7 +272,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle $weights[] = $weight; $table[$name] = array( '#parents' => array($name), - '#attributes' => array('class' => array('draggable tabledrag-leaf')), + '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')), 'label' => array( '#markup' => check_plain($instance['label']), ), @@ -724,14 +777,26 @@ 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('')), + // Add ID for tabledrag behavior. + '#attributes' => array('id' => 'field-display-overview'), + // Add AJAX wrapper. + '#prefix' => '
', + '#suffix' => '
', ); $field_label_options = array( @@ -744,50 +809,70 @@ 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', 'field-name-' . drupal_html_class($name))), + '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']; @@ -816,40 +901,43 @@ 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(); $additions = module_invoke($formatter['module'], 'field_formatter_settings_form', $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 { @@ -860,6 +948,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', @@ -874,7 +963,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']); @@ -882,31 +970,45 @@ 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', 'field-name-' . drupal_html_class($name))), + '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') { @@ -937,14 +1039,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; } @@ -954,23 +1073,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; } @@ -982,75 +1102,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']; } /** @@ -1065,7 +1150,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 @@ -1097,8 +1182,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', ); } @@ -1737,25 +1822,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..7738396 100644 --- modules/field_ui/field_ui.css +++ modules/field_ui/field_ui.css @@ -16,36 +16,42 @@ } /* '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; +} +#field-ui-display-overview-form #edit-refresh { + aaaadisplay:none; } \ No newline at end of file diff --git modules/field_ui/field_ui.js modules/field_ui/field_ui.js index dff02b8..d32f379 100644 --- modules/field_ui/field_ui.js +++ modules/field_ui/field_ui.js @@ -89,8 +89,9 @@ jQuery.fn.fieldPopulateOptions = function (options, selected) { */ 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 +107,62 @@ 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 row = dragObject.rowObject.element; + var regionRow = $(row).prevAll('tr.region-message').get(0); var visibility = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); - + var oldVisibility = row.className.replace(/([^ ]+[ ]+)*field-display-([^ ]+)([ ]+[^ ]+)*/, '$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('-', '_'); + // Operate on all rows in the dragged group. + var rows = []; + $.each(dragObject.rowObject.group, function (index, groupRow) { + var fieldName = groupRow.className.match(/\bfield-name-(\S+)\b/)[1].replace('-', '_'); + rows.push(fieldName); + // @todo using class name field-formatter-type is not cool... + var $select = $('select.field-formatter-type', groupRow); + // @todo : reevaluate if we need to alter class - whole table is reloaded. + $select.removeClass('field-display-' + oldVisibility).addClass('field-display-' + visibility); + + // Update the selected formatter if coming from an actual drag. + // @todo check noupdate... + if (!$select.data('noUpdate')) { + if (visibility == '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 = (fieldName in defaultFormatters) ? defaultFormatters[fieldName] : '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. + // 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(/([^ ]+[ ]+)*field-display-([^ ]+)([ ]+[^ ]+)*/, '$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 +173,23 @@ 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') { $('tr:last', tableDrag.table).after($row); } else { $('tr.region-title-hidden', tableDrag.table).before($row); } - + + // Remove indentations. + // @todo doesn't work + var indent = $('.indentation', tableDrag.rowObject.element).length; + tableDrag.rowObject.indent(-indent); + // @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 +202,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 +211,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/image/image.field.inc modules/image/image.field.inc index 87fbd31..4ab4e0d 100644 --- modules/image/image.field.inc +++ modules/image/image.field.inc @@ -428,14 +428,17 @@ function image_field_formatter_info() { 'image' => array( 'label' => t('Image'), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ), 'image_link_content' => array( 'label' => t('Image linked to content'), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ), 'image_link_file' => array( 'label' => t('Image linked to file'), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ), ); @@ -443,14 +446,17 @@ function image_field_formatter_info() { $formatters['image__' . $style['name']] = array( 'label' => t('Image "@style"', array('@style' => $style['name'])), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ); $formatters['image_link_content__' . $style['name']] = array( 'label' => t('Image "@style" linked to content', array('@style' => $style['name'])), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ); $formatters['image_link_file__' . $style['name']] = array( 'label' => t('Image "@style" linked to file', array('@style' => $style['name'])), 'field types' => array('image'), + 'settings' => array('setting_1' => 1, 'setting_2' => 'none', 'setting_3' => 1), ); } @@ -458,6 +464,58 @@ function image_field_formatter_info() { } /** + * Implements hook_field_formatter_settings_form(). + */ +function image_field_formatter_settings_form($field, $instance, $view_mode) { + $display = $instance['display'][$view_mode]; + $settings = $display['settings']; + + $form = array(); + + $form['setting_1'] = array( + '#title' => t('Some option'), + '#type' => 'textfield', + '#size' => 20, + '#default_value' => $settings['setting_1'], + '#element_validate' => array('_element_validate_integer_positive'), + '#description' => t('Some longish description. Lorem ipsum dolor sit amet, consectetur adipiscing elit'), + '#required' => TRUE, + ); + + $form['setting_2'] = array( + '#title' => t('Other option'), + '#type' => 'select', + '#default_value' => $settings['setting_2'], + '#options' => array(1 => t('option 1'), 2 => t('option 2')), + '#description' => t('Vivamus nec magna vel lectus congue eleifend. Mauris dapibus erat eu tortor gravida ut suscipit dui tincidunt.'), + ); + + $form['setting_3'] = array( + '#title' => t('With sugar'), + '#type' => 'checkbox', + '#default_value' => $settings['setting_3'], + ); + + return $form; +} + +/** + * Implements hook_field_formatter_settings_summary(). + */ +function image_field_formatter_settings_summary($field, $instance, $view_mode) { + $display = $instance['display'][$view_mode]; + $settings = $display['settings']; + + $summary[] = t('Some option: @value', array('@value' => $settings['setting_1'])); + $summary[] = t('Other option: @value', array('@value' => $settings['setting_2'])); + if ($settings['setting_3']) { + $summary[] = t('With sugar'); + } + + return implode ('
', $summary); +} + +/** * Implements hook_field_formatter_view(). */ function image_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { diff --git themes/seven/style.css themes/seven/style.css index 13979ec..fd1ec84 100644 --- themes/seven/style.css +++ themes/seven/style.css @@ -942,23 +942,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; }