diff --git a/app/views/admin/budgets/_group.html.erb b/app/views/admin/budgets/_group.html.erb index 3660fa0c1..2890ada2c 100644 --- a/app/views/admin/budgets/_group.html.erb +++ b/app/views/admin/budgets/_group.html.erb @@ -1,76 +1,74 @@ -
- - - - - +
- <%= group.name %> - <%= link_to t("admin.budgets.form.add_heading"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#group-#{group.id}-new-heading-form" } %> -
+ + + + - <% if headings.blank? %> - - - - - <% else %> - - - - - - - - <% end %> - - - - - - - - <% headings.each do |heading| %> + <% if headings.blank? %> + - - - + <% else %> + + + + + + + + <% end %> + + + + -
+ <%= group.name %> + <%= link_to t("admin.budgets.form.add_heading"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#group-#{group.id}-new-heading-form" } %> +
-
- <%= t("admin.budgets.form.no_heading") %> -
-
<%= t("admin.budgets.form.table_heading") %><%= t("admin.budgets.form.table_amount") %><%= t("admin.budgets.form.table_geozone") %>
- <%= heading.name %> - - <%= heading.price %> - - <%= geozone_name_from_id heading.geozone_id %> + +
+ <%= t("admin.budgets.form.no_heading") %> +
<%= t("admin.budgets.form.table_heading") %><%= t("admin.budgets.form.table_amount") %><%= t("admin.budgets.form.table_geozone") %>
-
\ No newline at end of file + + + + + <% headings.each do |heading| %> + + + <%= heading.name %> + + + <%= heading.price %> + + + <%= geozone_name_from_id heading.geozone_id %> + + + <% end %> + + + diff --git a/app/views/admin/budgets/_groups.html.erb b/app/views/admin/budgets/_groups.html.erb index ba785ee0c..f5dde3aa1 100644 --- a/app/views/admin/budgets/_groups.html.erb +++ b/app/views/admin/budgets/_groups.html.erb @@ -1,34 +1,32 @@ -
-

<%= t('admin.budgets.show.groups') %>

- <% if groups.blank? %> -
- <%= t("admin.budgets.form.no_groups") %> - <%= link_to t("admin.budgets.form.add_group"), "#", - class: "js-toggle-link", - data: { "toggle-selector" => "#new-group-form" } %> -
- <% else %> - <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %> - <% end %> +

<%= t('admin.budgets.show.groups') %>

+<% if groups.blank? %> +
+ <%= t("admin.budgets.form.no_groups") %> + <%= link_to t("admin.budgets.form.add_group"), "#", + class: "js-toggle-link", + data: { "toggle-selector" => "#new-group-form" } %> +
+<% else %> + <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %> +<% end %> - <%= form_for [:admin, @budget, Budget::Group.new], html: {id: "new-group-form", style: "display:none"}, remote: true do |f| %> -
- - - - <%= f.text_field :name, - label: false, - maxlength: 50, - placeholder: t("admin.budgets.form.group") %> -
- <%= f.submit t("admin.budgets.form.create_group"), class: "button success" %> -
+<%= form_for [:admin, @budget, Budget::Group.new], html: {id: "new-group-form", style: "display:none"}, remote: true do |f| %> +
+ + + + <%= f.text_field :name, + label: false, + maxlength: 50, + placeholder: t("admin.budgets.form.group") %> +
+ <%= f.submit t("admin.budgets.form.create_group"), class: "button success" %>
- <% end %> +
+<% end %> - <% groups.each do |group| %> -
- <%= render "admin/budgets/group", group: group, headings: group.headings %> -
- <% end %> -
\ No newline at end of file +<% groups.each do |group| %> +
+ <%= render "admin/budgets/group", group: group, headings: group.headings %> +
+<% end %> diff --git a/app/views/admin/budgets/show.html.erb b/app/views/admin/budgets/show.html.erb index 4468f7599..1f3292019 100644 --- a/app/views/admin/budgets/show.html.erb +++ b/app/views/admin/budgets/show.html.erb @@ -1,16 +1,10 @@ -
-
-

<%= @budget.name %> <%= link_to(t('shared.edit'), edit_admin_budget_path(@budget)) %>

+<%= link_to admin_budgets_path do %> + + <%= t('shared.back') %> +<% end %> - <%= @budget.description %> +

<%= @budget.name %>

-

- <%= t('admin.budgets.show.phase') %>: <%= t("budget.phase.#{@budget.phase}") %> | - <%= t('admin.budgets.show.currency') %>: <%= @budget.currency_symbol %> -

-
-
- -
+
<%= render "groups", groups: @budget.groups %>