fixes conflicts with budgets

This commit is contained in:
rgarcia
2017-01-05 13:14:09 +01:00
58 changed files with 409 additions and 389 deletions

View File

@@ -2,8 +2,9 @@
<%= render 'shared/errors', resource: @investment %>
<div class="row">
<div class="small-12 column">
<%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: true %>
<div class="small-12 medium-8 column">
<%= f.label :heading_id, t("budget.investments.form.heading") %>
<%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, label: false} %>
</div>
<div class="small-12 column">
@@ -58,8 +59,8 @@
<% end %>
<div class="actions small-12 column">
<%= f.submit(nil, class: "button") %>
<div class="actions small-12 medium-6 large-4 end column">
<%= f.submit(class: "button expanded", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
</div>
</div>
<% end %>