diff --git a/app/views/deliverables/_finance_form.html.erb b/app/views/deliverables/_finance_form.html.erb index 1268082..8d0fad2 100644 --- a/app/views/deliverables/_finance_form.html.erb +++ b/app/views/deliverables/_finance_form.html.erb @@ -42,34 +42,8 @@
- <% form.fields_for :fixed_budgets, fixed_budgets do |fixed_budget| %> - <%= fixed_budget.hidden_field(:year) %> - <%= fixed_budget.hidden_field(:month) %> - -

<%= fixed_budget.label(:title, l(:field_title))%> - <%= fixed_budget.text_field(:title) %> -

- -

- <%= fixed_budget.label(:budget, l(:field_budget))%> <%= l(:text_dollar_sign) %> - <%= fixed_budget.text_field(:budget, :value => format_deliverable_value_fields(fixed_budget.object.budget), :class => 'financial') %> -

- -

- <%= fixed_budget.label(:markup, l(:field_markup)) %> <%= l(:field_discount_hint) %> - <%= fixed_budget.text_field(:markup, :value => format_deliverable_value_fields_as_dollar_or_percent(fixed_budget.object.markup), :class => 'financial') %> -

- -

- <%= fixed_budget.label(:paid, l(:field_paid)) %> - <%= fixed_budget.check_box(:paid) %> -

- - - <%= fixed_budget.text_area(:description, :class => 'wiki-edit', :rows => '5', :id => "fixed-description#{fixed_budget.object.object_id}") %> - <%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %> - -

<%= release(3, "Green Add button for multiple records") %>

+ <% form.fields_for :fixed_budgets, fixed_budgets.sort_by(&:id) do |fixed_budget| %> + <%= render :partial => 'fixed_budget_form', :locals => {:fixed_budget => fixed_budget} %> <% end %>
diff --git a/app/views/deliverables/_fixed_budget_form.html.erb b/app/views/deliverables/_fixed_budget_form.html.erb new file mode 100644 index 0000000..54a7a6d --- /dev/null +++ b/app/views/deliverables/_fixed_budget_form.html.erb @@ -0,0 +1,27 @@ + <%= fixed_budget.hidden_field(:year) %> + <%= fixed_budget.hidden_field(:month) %> + +

<%= fixed_budget.label(:title, l(:field_title))%> + <%= fixed_budget.text_field(:title) %> +

+ +

+ <%= fixed_budget.label(:budget, l(:field_budget))%> <%= l(:text_dollar_sign) %> + <%= fixed_budget.text_field(:budget, :value => format_deliverable_value_fields(fixed_budget.object.budget), :class => 'financial') %> +

+ +

+ <%= fixed_budget.label(:markup, l(:field_markup)) %> <%= l(:field_discount_hint) %> + <%= fixed_budget.text_field(:markup, :value => format_deliverable_value_fields_as_dollar_or_percent(fixed_budget.object.markup), :class => 'financial') %> +

+ +

+ <%= fixed_budget.label(:paid, l(:field_paid)) %> + <%= fixed_budget.check_box(:paid) %> +

+ + + <%= fixed_budget.text_area(:description, :class => 'wiki-edit', :rows => '5', :id => "fixed-description#{fixed_budget.object.object_id}") %> + <%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %> + +

<%= release(3, "Green Add button for multiple records") %>