Project

General

Profile

Revision 8d02775b

Added by Assos Assos about 4 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/webform/includes/webform.components.inc
453 453
    '#weight' => 8,
454 454
  );
455 455
  if (webform_component_feature($component['type'], 'title_display')) {
456
    if (webform_component_feature($component['type'], 'title_inline')) {
456
    $inline_option = webform_component_feature($component['type'], 'title_inline') ? array('inline' => t('Inline')) : array();
457
    $internal_option = webform_component_feature($component['type'], 'title_internal') ? array('internal' => t('Inside the component')) : array();
458
    if ($inline_option || $internal_option) {
457 459
      $form['display']['title_display'] = array(
458 460
        '#type' => 'select',
459 461
        '#title' => t('Label display'),
460 462
        '#default_value' => !empty($component['extra']['title_display']) ? $component['extra']['title_display'] : 'before',
461
        '#options' => array(
462
          'before' => t('Above'),
463
          'inline' => t('Inline'),
464
          'none' => t('None'),
465
        ),
463
        '#options' => array('before' => t('Above')) +
464
                      $inline_option +
465
                      $internal_option +
466
                      array('none' => t('None')),
466 467
        '#description' => t("Determines the placement of the component's label."),
467 468
      );
468 469
    }
......
998 999
    'title' => TRUE,
999 1000
    'title_display' => TRUE,
1000 1001
    'title_inline' => TRUE,
1002
    'title_internal' => FALSE,
1001 1003
    'conditional' => TRUE,
1002 1004
    'conditional_action_set' => FALSE,
1003 1005
    'spam_analysis' => FALSE,

Also available in: Unified diff