diff --git a/app/views/ingredients/_filters.html.erb b/app/views/ingredients/_filters.html.erb index 2189dc9..95bf2e0 100644 --- a/app/views/ingredients/_filters.html.erb +++ b/app/views/ingredients/_filters.html.erb @@ -1,35 +1,37 @@
<%= l(:label_filter_plural) %> - <%= error_messages_for @formula_q %> +
+ <%= error_messages_for @formula_q %> - <%= form_tag url, id: 'filters_form', method: :get, remote: true do %> - - - - - - - - -
- <%= text_field_tag 'filters[name]', session[:filters][:name], placeholder: 'name', - :onblur => '$("#filters_form").submit(); return false;' %> - - <%= select_tag 'filters[visibility]', - visibility_options(session[:filters][:visibility]), - :onchange => '$("#filters_form").submit(); return false;' %> - - <%= text_field_tag 'filters[nutrients]', session[:filters][:nutrients], - placeholder: 'conditional expression including nutrients', size: 40, - :style => 'box-sizing:border-box; width:100%;', - :onblur => '$("#filters_form").submit(); return false;' %> - - <%= link_to l(:button_apply), '#', :class => "icon icon-checked", - :onclick => '$("#filters_form").submit(); return false;' %> - - <%= link_to l(:button_clear), '#', :class => "icon icon-reload", - :onclick => '$("#filters_form input, #filters_form select").val(""); - $("#filters_form").submit(); return false;' %> -
- <% end %> + <%= form_tag url, id: 'filters_form', method: :get, remote: true do %> + + + + + + + + +
+ <%= text_field_tag 'filters[name]', session[:filters][:name], placeholder: 'name', + :onblur => '$("#filters_form").submit(); return false;' %> + + <%= select_tag 'filters[visibility]', + visibility_options(session[:filters][:visibility]), + :onchange => '$("#filters_form").submit(); return false;' %> + + <%= text_field_tag 'filters[nutrients]', session[:filters][:nutrients], + placeholder: 'conditional expression including nutrients', size: 40, + :style => 'box-sizing:border-box; width:100%;', + :onblur => '$("#filters_form").submit(); return false;' %> + + <%= link_to l(:button_apply), '#', :class => "icon icon-checked", + :onclick => '$("#filters_form").submit(); return false;' %> + + <%= link_to l(:button_clear), '#', :class => "icon icon-reload", + :onclick => '$("#filters_form input, #filters_form select").val(""); + $("#filters_form").submit(); return false;' %> +
+ <% end %> +
diff --git a/app/views/ingredients/_options.html.erb b/app/views/ingredients/_options.html.erb index 645cbd0..f8ec48a 100644 --- a/app/views/ingredients/_options.html.erb +++ b/app/views/ingredients/_options.html.erb @@ -1,19 +1,21 @@
<%= l(:label_options) %> - <%= form_tag toggle_nutrient_column_project_ingredients_path(@project), - id: 'add_nutrient_column', method: :post, remote: true do %> - - - - - - -
- <%= select_tag 'id', nutrient_column_options %> - - <%= submit_tag l(:button_add) %> -
- <% end %> +
+ <%= form_tag toggle_nutrient_column_project_ingredients_path(@project), + id: 'add_nutrient_column', method: :post, remote: true do %> + + + + + + +
+ <%= select_tag 'id', nutrient_column_options %> + + <%= submit_tag l(:button_add) %> +
+ <% end %> +