Projet

Général

Profil

Révision 3dfa8105

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ds/includes/ds.field_ui.inc
982 982
      '#options' => $options,
983 983
      '#default_value' => $settings['taxonomy_term_reference_view_mode'],
984 984
    );
985
    $element['use_content_language'] = array(
986
      '#type' => 'checkbox',
987
      '#title' => t('Use current content language'),
988
      '#default_value' => $settings['use_content_language'],
989
    );
985 990
    return $element;
986 991
  }
987 992

  
......
1027 1032
    $entity_info = entity_get_info('taxonomy_term');
1028 1033
    $modes = $entity_info['view modes'];
1029 1034
    $mode = $modes[$settings['taxonomy_term_reference_view_mode']]['label'];
1030
    $summary = t('View mode: %mode', array('%mode' => $mode));
1035
    $summary .= t('View mode: %mode', array('%mode' => $mode)) . '<br />';;
1036
    $summary .= !empty($settings['use_content_language']) ? t('Use current content language') : t('Use field language');
1031 1037
  }
1032 1038

  
1033 1039
  if ($display['type'] === 'ds_taxonomy_separator' || $display['type'] == 'ds_taxonomy_separator_localized') {
......
1613 1619
  if (!empty($layout) && isset($layout->regions)) {
1614 1620

  
1615 1621
    // Add wrappers
1616
    $wrapper_options = array('div' => 'Div', 'span' => 'Span', 'section' => 'Section', 'article' => 'Article', 'header' => 'Header', 'footer' => 'Footer', 'aside' => 'Aside');
1622
    $wrapper_options = array(
1623
      'div' => 'Div',
1624
      'span' => 'Span',
1625
      'section' => 'Section',
1626
      'article' => 'Article',
1627
      'header' => 'Header',
1628
      'footer' => 'Footer',
1629
      'aside' => 'Aside',
1630
      'figure' => 'Figure'
1631
    );
1617 1632
    $form['additional_settings']['region_wrapper'] = array(
1618 1633
      '#type' => 'fieldset',
1619 1634
      '#title' => t('Custom wrappers'),
......
2027 2042
  foreach ($fields as $key => $field) {
2028 2043

  
2029 2044
    // Check on ui_limit.
2030
    if (isset($field['ui_limit'])) {
2045
    if (!empty($field['ui_limit'])) {
2031 2046

  
2032 2047
      $continue = TRUE;
2033 2048
      foreach ($field['ui_limit'] as $limitation) {
......
2252 2267

  
2253 2268
        // Load the form
2254 2269
        module_load_include('inc', 'ds_extras', 'includes/ds_extras.admin');
2270
        if (!is_array($settings_form)) $settings_form = array();
2255 2271
        ds_extras_field_template_settings_form($settings_form, $form_state, $context);
2256 2272
      }
2257 2273

  
......
2470 2486
    'custom_field' => t('Add a code field'),
2471 2487
    'manage_ctools' => t('Add a dynamic field'),
2472 2488
  );
2473
  if (module_exists('block')) {
2474
    $field_types['manage_block'] = t('Add a block field');
2475
  }
2489
  $field_types['manage_block'] = t('Add a block field');
2476 2490
  $field_types['manage_preprocess'] = t('Add a preprocess field');
2477 2491

  
2478 2492
  foreach ($field_types as $field_key => $field_title) {

Formats disponibles : Unified diff