diff --git a/app/views/management/budgets/investments/index.html.erb b/app/views/management/budgets/investments/index.html.erb index dd64ebeaf..4dfc94848 100644 --- a/app/views/management/budgets/investments/index.html.erb +++ b/app/views/management/budgets/investments/index.html.erb @@ -1,30 +1,28 @@ -
- - <%= render "admin/shared/budget_investment_search", url: management_budget_investments_path(@budget) %> - + + <%= render "admin/shared/budget_investment_search", url: management_budget_investments_path(@budget) %> + -
-
+
+
-
- <%= tag.h2 t("management.budget_investments.filters.unfeasible") if params[:unfeasible].present? %> - <%= tag.h2 t("management.budget_investments.filters.heading", heading: @heading.name) if @heading.present? %> - <% if params[:search].present? %> -

- <%= page_entries_info @investments %> - <%= t("management.budget_investments.search_results", count: @investments.size, search_term: params[:search]) %> -

- <% end %> -
- - <% @investments.each do |investment| %> - <%= render "/budgets/investments/investment", - investment: investment, - investment_ids: @investment_ids, - ballot: @ballot %> +
+ <%= tag.h2 t("management.budget_investments.filters.unfeasible") if params[:unfeasible].present? %> + <%= tag.h2 t("management.budget_investments.filters.heading", heading: @heading.name) if @heading.present? %> + <% if params[:search].present? %> +

+ <%= page_entries_info @investments %> + <%= t("management.budget_investments.search_results", count: @investments.size, search_term: params[:search]) %> +

<% end %> - - <%= paginate @investments %>
+ + <% @investments.each do |investment| %> + <%= render "/budgets/investments/investment", + investment: investment, + investment_ids: @investment_ids, + ballot: @ballot %> + <% end %> + + <%= paginate @investments %>
-
+ diff --git a/app/views/management/budgets/investments/print.html.erb b/app/views/management/budgets/investments/print.html.erb index 9eb52c9af..4b5de991d 100644 --- a/app/views/management/budgets/investments/print.html.erb +++ b/app/views/management/budgets/investments/print.html.erb @@ -1,37 +1,35 @@ -
- - <%= render "admin/shared/budget_investment_search", url: print_management_budget_investments_path(@budget) %> - + + <%= render "admin/shared/budget_investment_search", url: print_management_budget_investments_path(@budget) %> + -
-
+
+
- + -
- <% if params[:unfeasible].present? %> -

<%= t("management.budget_investments.filters.unfeasible") %>

- <% end %> - <% if @heading.present? %> -

<%= t("management.budget_investments.filters.heading", heading_name: @heading.name) %>

- <% end %> -

<%= t("management.budget_investments.search_results", count: @investments.count, search_term: params[:search]) %>

-
- - <% @investments.each do |investment| %> - <%= render "/budgets/investments/investment", - investment: investment, - investment_ids: @investment_ids, - ballot: @ballot %> +
+ <% if params[:unfeasible].present? %> +

<%= t("management.budget_investments.filters.unfeasible") %>

<% end %> + <% if @heading.present? %> +

<%= t("management.budget_investments.filters.heading", heading_name: @heading.name) %>

+ <% end %> +

<%= t("management.budget_investments.search_results", count: @investments.count, search_term: params[:search]) %>

+
-
-

<%= t("management.print.budget_investments_info") %>

-
+ <% @investments.each do |investment| %> + <%= render "/budgets/investments/investment", + investment: investment, + investment_ids: @investment_ids, + ballot: @ballot %> + <% end %> + +
+

<%= t("management.print.budget_investments_info") %>

-
+ diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb index da89c1dbf..3a47eb1c1 100644 --- a/app/views/management/proposals/index.html.erb +++ b/app/views/management/proposals/index.html.erb @@ -1,24 +1,22 @@ -
-

<%= t("management.proposals.index.title") %>

+

<%= t("management.proposals.index.title") %>

- <%= render Admin::SearchComponent.new(label: t("admin.shared.search.label.proposals")) %> +<%= render Admin::SearchComponent.new(label: t("admin.shared.search.label.proposals")) %> -
-
+
+
-
- <% if @search_terms %> -

- <%= page_entries_info @proposals %> - <%= sanitize(t("proposals.index.search_results", - count: @proposals.size, - search_term: strip_tags(@search_terms))) %> -

- <% end %> +
+ <% if @search_terms %> +

+ <%= page_entries_info @proposals %> + <%= sanitize(t("proposals.index.search_results", + count: @proposals.size, + search_term: strip_tags(@search_terms))) %> +

+ <% end %> - <%= render @proposals %> - <%= paginate @proposals %> -
+ <%= render @proposals %> + <%= paginate @proposals %>
-
+ diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index 6dc20b639..ccf909753 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -1,29 +1,27 @@ -
-
-
- - <%= t("management.proposals.print.print_button") %> - +
+
+ + <%= t("management.proposals.print.print_button") %> + - <%= image_tag "header_print_proposals.jpg", class: "for-print-only" %> + <%= image_tag "header_print_proposals.jpg", class: "for-print-only" %> -
- <%= l Date.current, format: :long %> +
+ <%= l Date.current, format: :long %> -

- <%= t("proposals.index.select_order_long") %> - <%= t("management.print.proposals_title") %> -

-
- <%= render "shared/order_links", i18n_namespace: "proposals.index" %> -
-
- - <%= render @proposals %> - -
-

<%= t("management.print.proposals_info") %>

+

+ <%= t("proposals.index.select_order_long") %> + <%= t("management.print.proposals_title") %> +

+
+ <%= render "shared/order_links", i18n_namespace: "proposals.index" %>
+ + <%= render @proposals %> + +
+

<%= t("management.print.proposals_info") %>

+
-
+