diff options
Diffstat (limited to 'modules/field_ui')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 35 | ||||
| -rw-r--r-- | modules/field_ui/field_ui.module | 38 |
2 files changed, 39 insertions, 34 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index 1907e3126..9143e99f4 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -469,8 +469,8 @@ function field_ui_field_overview_form_submit($form, &$form_state) { if (in_array($key, $form['#fields'])) { $instance = field_read_instance($obj_type, $key, $bundle); $instance['widget']['weight'] = $values['weight']; - foreach($instance['display'] as $build_mode => $display) { - $instance['display'][$build_mode]['weight'] = $values['weight']; + foreach($instance['display'] as $view_mode => $display) { + $instance['display'][$view_mode]['weight'] = $values['weight']; } field_update_instance($instance); } @@ -568,9 +568,9 @@ function field_ui_field_overview_form_submit($form, &$form_state) { * Menu callback; presents a listing of fields display settings for a content type. * * This form includes form widgets to select which fields appear in teaser and - * full build modes, and how the field labels should be rendered. + * full view modes, and how the field labels should be rendered. */ -function field_ui_display_overview_form($form, &$form_state, $obj_type, $bundle, $build_modes_selector = 'basic') { +function field_ui_display_overview_form($form, &$form_state, $obj_type, $bundle, $view_modes_selector = 'basic') { $bundle = field_extract_bundle($obj_type, $bundle); field_ui_inactive_message($obj_type, $bundle); @@ -579,14 +579,14 @@ function field_ui_display_overview_form($form, &$form_state, $obj_type, $bundle, // Gather type information. $instances = field_info_instances($obj_type, $bundle); $field_types = field_info_field_types(); - $build_modes = field_ui_build_modes_tabs($obj_type, $build_modes_selector); + $view_modes = field_ui_view_modes_tabs($obj_type, $view_modes_selector); $form += array( '#tree' => TRUE, '#object_type' => $obj_type, '#bundle' => $bundle, '#fields' => array_keys($instances), - '#contexts' => $build_modes_selector, + '#contexts' => $view_modes_selector, ); if (empty($instances)) { @@ -612,14 +612,14 @@ function field_ui_display_overview_form($form, &$form_state, $obj_type, $bundle, $formatter_options = field_ui_formatter_options($field['type']); $formatter_options['hidden'] = t('<Hidden>'); - foreach ($build_modes as $build_mode => $label) { - $display = isset($instance['display'][$build_mode]) ? $instance['display'][$build_mode] : $instance['display']['full']; - $form[$name][$build_mode]['label'] = array( + foreach ($view_modes as $view_mode) { + $display = isset($instance['display'][$view_mode]) ? $instance['display'][$view_mode] : $instance['display']['full']; + $form[$name][$view_mode]['label'] = array( '#type' => 'select', '#options' => $label_options, '#default_value' => $display['label'], ); - $form[$name][$build_mode]['type'] = array( + $form[$name][$view_mode]['type'] = array( '#type' => 'select', '#options' => $formatter_options, '#default_value' => $display['type'], @@ -631,7 +631,6 @@ function field_ui_display_overview_form($form, &$form_state, $obj_type, $bundle, return $form; } - /** * Theme preprocess function for field_ui-display-overview-form.tpl.php. */ @@ -639,7 +638,13 @@ function template_preprocess_field_ui_display_overview_form(&$vars) { $form = &$vars['form']; $contexts_selector = $form['#contexts']; - $vars['contexts'] = field_ui_build_modes_tabs($form['#object_type'], $contexts_selector); + $view_modes = field_ui_view_modes_tabs($form['#object_type'], $contexts_selector); + $entity_info = entity_get_info($form['#object_type']); + $view_modes_info = $entity_info['view modes']; + $vars['contexts'] = array(); + foreach ($view_modes as $view_mode) { + $vars['contexts'][$view_mode] = $view_modes_info[$view_mode]['label']; + } $order = _field_ui_overview_order($form, $form['#fields']); if (empty($order)) { @@ -676,9 +681,9 @@ function field_ui_display_overview_form_submit($form, &$form_state) { foreach ($form_values as $key => $values) { if (in_array($key, $form['#fields'])) { $instance = field_info_instance($form['#object_type'], $key, $form['#bundle']); - foreach ($instance['display'] as $build_mode => $display) { - if (isset($values[$build_mode])) { - $instance['display'][$build_mode] = array_merge($instance['display'][$build_mode], $values[$build_mode]); + foreach ($instance['display'] as $view_mode => $display) { + if (isset($values[$view_mode])) { + $instance['display'][$view_mode] = array_merge($instance['display'][$view_mode], $values[$view_mode]); } } field_update_instance($instance); diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module index 18275dd4d..b24ef7776 100644 --- a/modules/field_ui/field_ui.module +++ b/modules/field_ui/field_ui.module @@ -117,7 +117,7 @@ function field_ui_menu() { 'weight' => 2, 'file' => 'field_ui.admin.inc', ) + $access; - $tabs = field_ui_build_modes_tabs($obj_type); + $tabs = field_ui_view_modes_tabs($obj_type); foreach ($tabs as $key => $tab) { $items["$path/display/$key"] = array( 'title' => $tab['title'], @@ -171,26 +171,26 @@ function field_ui_theme() { } /** - * Group available build modes on tabs on the 'Manage display' page. + * Group available view modes on tabs on the 'Manage display' page. * * @todo Remove this completely and use vertical tabs? */ -function field_ui_build_modes_tabs($obj_type, $tab_selector = NULL) { +function field_ui_view_modes_tabs($obj_type, $tab_selector = NULL) { $info = &drupal_static(__FUNCTION__); if (!isset($info[$obj_type])) { - $info[$obj_type] = module_invoke_all('field_ui_build_modes_tabs'); - // Collect titles, and filter out non active modes. - $active_modes = field_build_modes($obj_type); + $info[$obj_type] = module_invoke_all('field_ui_view_modes_tabs', $obj_type); + // Filter out inactive modes. + $entity_info = entity_get_info($obj_type); foreach ($info[$obj_type] as $tab => $values) { $modes = array(); - foreach ($info[$obj_type][$tab]['build modes'] as $mode) { - if (isset($active_modes[$mode])) { - $modes[$mode] = $active_modes[$mode]; + foreach ($info[$obj_type][$tab]['view modes'] as $mode) { + if (isset($entity_info['view modes'][$mode])) { + $modes[] = $mode; } } if ($modes) { - $info[$obj_type][$tab]['build modes'] = $modes; + $info[$obj_type][$tab]['view modes'] = $modes; } else { unset($info[$obj_type][$tab]); @@ -198,16 +198,16 @@ function field_ui_build_modes_tabs($obj_type, $tab_selector = NULL) { } } if ($tab_selector) { - return isset($info[$obj_type][$tab_selector]) ? $info[$obj_type][$tab_selector]['build modes'] : array(); + return isset($info[$obj_type][$tab_selector]) ? $info[$obj_type][$tab_selector]['view modes'] : array(); } return $info[$obj_type]; } /** - * Implements hook_field_ui_build_modes_tabs() on behalf of other core modules. + * Implements hook_field_ui_view_modes_tabs() on behalf of other core modules. * * @return - * An array describing the build modes defined by the module, grouped by tabs. + * An array describing the view modes defined by the module, grouped by tabs. * * A module can add its render modes to a tab defined by another module. * Expected format: @@ -215,7 +215,7 @@ function field_ui_build_modes_tabs($obj_type, $tab_selector = NULL) { * array( * 'tab1' => array( * 'title' => t('The human-readable title of the tab'), - * 'build modes' => array('mymodule_mode1', 'mymodule_mode2'), + * 'view modes' => array('mymodule_mode1', 'mymodule_mode2'), * ), * 'tab2' => array( * // ... @@ -223,23 +223,23 @@ function field_ui_build_modes_tabs($obj_type, $tab_selector = NULL) { * ); * @endcode */ -function field_ui_field_ui_build_modes_tabs() { +function field_ui_field_ui_view_modes_tabs() { $modes = array( 'basic' => array( 'title' => t('Basic'), - 'build modes' => array('teaser', 'full'), + 'view modes' => array('teaser', 'full'), ), 'rss' => array( 'title' => t('RSS'), - 'build modes' => array('rss'), + 'view modes' => array('rss'), ), 'print' => array( 'title' => t('Print'), - 'build modes' => array('print'), + 'view modes' => array('print'), ), 'search' => array( 'title' => t('Search'), - 'build modes' => array('search_index', 'search_result'), + 'view modes' => array('search_index', 'search_result'), ), ); return $modes; |