diff --git a/app/overrides/spree/admin/image_settings/edit/add_image_format.html.haml.deface b/app/overrides/spree/admin/image_settings/edit/add_image_format.html.haml.deface deleted file mode 100644 index fe050c6c7c..0000000000 --- a/app/overrides/spree/admin/image_settings/edit/add_image_format.html.haml.deface +++ /dev/null @@ -1,11 +0,0 @@ -/ replace_contents '#styles_list' - -- @styles.each_with_index do |(style_name, style_value), index| - .field.three.columns - = label_tag "attachment_styles[#{style_name}]", style_name - %a.destroy_style{:alt => t(:destroy), :href => "#", :title => t(:destroy)} - %i.icon-trash - = text_field_tag "attachment_styles[#{style_name}][]", admin_image_settings_geometry_from_style(style_value), :class => 'fullwidth' - %br/ - - current_format = admin_image_settings_format_from_style(style_value) || '' - = select_tag "attachment_styles[#{style_name}][]", options_for_select(admin_image_settings_format_options, current_format), :class => 'fullwidth', :id => "attachment_styles_format_#{style_name}" diff --git a/app/views/spree/admin/image_settings/edit.html.haml b/app/views/spree/admin/image_settings/edit.html.haml index 2716cdd848..4345755792 100644 --- a/app/views/spree/admin/image_settings/edit.html.haml +++ b/app/views/spree/admin/image_settings/edit.html.haml @@ -38,9 +38,12 @@ - @styles.each_with_index do |(style_name, style_value), index| .field.three.columns = label_tag "attachment_styles[#{style_name}]", style_name - %a.destroy_style.with-tip{:alt => destroy, :href => "#", :title => destroy} + %a.destroy_style{:alt => t(:destroy), :href => "#", :title => t(:destroy)} %i.icon-trash - = text_field_tag "attachment_styles[#{style_name}]", style_value, :class => 'fullwidth' + = text_field_tag "attachment_styles[#{style_name}][]", admin_image_settings_geometry_from_style(style_value), :class => 'fullwidth' + %br/ + - current_format = admin_image_settings_format_from_style(style_value) || '' + = select_tag "attachment_styles[#{style_name}][]", options_for_select(admin_image_settings_format_options, current_format), :class => 'fullwidth', :id => "attachment_styles_format_#{style_name}" #new-styles.row.frameless .field = link_to_with_icon 'icon-plus', Spree.t(:add_new_style), '#', :class => 'add_new_style button'