diff --git a/app/views/alchemy/admin/ingredients/_file_fields.html.erb b/app/views/alchemy/admin/ingredients/_file_fields.html.erb index 8b03c5a574..fcfda6c87c 100644 --- a/app/views/alchemy/admin/ingredients/_file_fields.html.erb +++ b/app/views/alchemy/admin/ingredients/_file_fields.html.erb @@ -1,18 +1,5 @@ -<% css_classes = ingredient.settings[:css_classes] %> - <%= f.input :link_text %> <%= f.input :title %> -<%- if css_classes.present? -%> - <%= f.input :css_class, - collection: css_classes, - include_blank: Alchemy.t('None') %> -<%- else -%> - <% Alchemy::Deprecation.warn %(Float positioning in File ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %> - <%= f.input :css_class, - label: Alchemy.t(:position_in_text), - collection: [ - [Alchemy.t(:above), "no_float"], - [Alchemy.t(:left), "left"], - [Alchemy.t(:right), "right"] - ], include_blank: Alchemy.t('Layout default') %> -<%- end -%> +<%= f.input :css_class, + collection: ingredient.settings[:css_classes], + include_blank: Alchemy.t('None') %> diff --git a/app/views/alchemy/admin/ingredients/_picture_fields.html.erb b/app/views/alchemy/admin/ingredients/_picture_fields.html.erb index 0436397b16..d04e4d53b0 100644 --- a/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +++ b/app/views/alchemy/admin/ingredients/_picture_fields.html.erb @@ -19,13 +19,4 @@ end end %> <%= f.input :css_class, collection: css_classes_collection, include_blank: false %> -<%- else -%> - <% Alchemy::Deprecation.warn %(Float positioning in Picture ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %> - <%= f.input :css_class, - label: Alchemy.t(:position_in_text), - collection: [ - [Alchemy.t(:above), "no_float"], - [Alchemy.t(:left), "left"], - [Alchemy.t(:right), "right"] - ], include_blank: Alchemy.t("Layout default") %> <%- end -%> diff --git a/spec/views/alchemy/admin/ingredients/edit_spec.rb b/spec/views/alchemy/admin/ingredients/edit_spec.rb index 5bbf761c44..57bf0e0ecb 100644 --- a/spec/views/alchemy/admin/ingredients/edit_spec.rb +++ b/spec/views/alchemy/admin/ingredients/edit_spec.rb @@ -8,12 +8,6 @@ view.instance_variable_set(:@ingredient, ingredient) end - around do |example| - Alchemy::Deprecation.silence do - example.run - end - end - context "for a picture ingredient" do let(:image) do fixture_file_upload(