diff options
Diffstat (limited to 'modules/image')
| -rw-r--r-- | modules/image/image.admin.inc | 7 | ||||
| -rw-r--r-- | modules/image/image.field.inc | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc index 657781156..9665a8523 100644 --- a/modules/image/image.admin.inc +++ b/modules/image/image.admin.inc @@ -116,7 +116,7 @@ function image_style_form($form, &$form_state, $style) { } // Build the new image effect addition form and add it to the effect list. - $new_effect_options = array('' => t('Select a new effect')); + $new_effect_options = array(); foreach (image_effect_definitions() as $effect => $definition) { $new_effect_options[$effect] = check_plain($definition['label']); } @@ -127,7 +127,9 @@ function image_style_form($form, &$form_state, $style) { ); $form['effects']['new']['new'] = array( '#type' => 'select', + '#required' => FALSE, '#options' => $new_effect_options, + '#empty_option' => t('Select a new effect'), ); $form['effects']['new']['weight'] = array( '#type' => 'weight', @@ -291,11 +293,12 @@ function image_style_delete_form($form, $form_state, $style) { $form_state['image_style'] = $style; $replacement_styles = array_diff_key(image_style_options(), array($style['name'] => '')); - $replacement_styles[''] = t('No replacement, just delete'); $form['replacement'] = array( '#title' => t('Replacement style'), '#type' => 'select', + '#required' => FALSE, '#options' => $replacement_styles, + '#empty_option' => t('No replacement, just delete'), ); return confirm_form( diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc index b54e601ab..221c5959d 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -269,7 +269,8 @@ function image_field_widget_settings_form($field, $instance) { $form['preview_image_style'] = array( '#title' => t('Preview image style'), '#type' => 'select', - '#options' => array('' => '<' . t('no preview') . '>') + image_style_options(FALSE), + '#required' => FALSE, + '#options' => image_style_options(FALSE), '#default_value' => $settings['preview_image_style'], '#description' => t('The preview image will be shown while editing the content.'), '#weight' => 15, @@ -418,22 +419,24 @@ function image_field_formatter_settings_form($field, $instance, $view_mode, $for $display = $instance['display'][$view_mode]; $settings = $display['settings']; - $image_styles = array('' => t('None (original image)')) + image_style_options(FALSE); + $image_styles = image_style_options(FALSE); $form['image_style'] = array( '#title' => t('Image style'), '#type' => 'select', + '#required' => FALSE, '#default_value' => $settings['image_style'], + '#empty_option' => t('None (original image)'), '#options' => $image_styles, ); $link_types = array( - '' => t('<none>'), 'content' => t('Content'), 'file' => t('File'), ); $form['image_link'] = array( '#title' => t('Link image to'), '#type' => 'select', + '#required' => FALSE, '#default_value' => $settings['image_link'], '#options' => $link_types, ); |