From c3c472b3b1cd1912047cc4bb28d71c373869a38b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 30 Aug 2010 10:09:13 -0700 Subject: [PATCH] [#4420] Extract the Deliverable finances form to a partial. --- app/views/deliverables/_finance_form.html.erb | 59 ++++++++++++++++++ app/views/deliverables/_form.html.erb | 60 +------------------ 2 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 app/views/deliverables/_finance_form.html.erb diff --git a/app/views/deliverables/_finance_form.html.erb b/app/views/deliverables/_finance_form.html.erb new file mode 100644 index 0000000..a672579 --- /dev/null +++ b/app/views/deliverables/_finance_form.html.erb @@ -0,0 +1,59 @@ +<% form.inputs :name => l(:text_deliverable_finances), :id => 'deliverable-finances' do %> + +
  • + <%= content_tag(:label, l(:field_labor)) %> + + + <% form.fields_for :labor_budgets do |labor_budget| %> + + <%# TODO: Select field for the Time Entry Activity in a td %> + + + + <%# TODO: Green Add button for multiple records %> + + + <% end %> +
    + + +

    <%= labor_budget.label(:hours, l(:text_short_hours)) %>

    + <%= labor_budget.text_field(:hours, :value => format_deliverable_value_fields(labor_budget.object.hours), :size => 10) %> +
    +

    <%= labor_budget.label(:budget, l(:text_dollar_sign)) %>

    + <%= labor_budget.text_field(:budget, :value => format_deliverable_value_fields(labor_budget.object.budget), :size => 10) %> +
    + Todo: Add button (Release 3) +
    +
  • + +
  • + <%= content_tag(:label, l(:field_overhead)) %> + + + <% form.fields_for :overhead_budgets do |overhead_budget| %> + + <%# TODO: Select field for the Time Entry Activity in a td %> + + + + <%# TODO: Green Add button for multiple records %> + + + <% end %> +
    + + +

    <%= overhead_budget.label(:hours, l(:text_short_hours)) %>

    + <%= overhead_budget.text_field(:hours, :value => format_deliverable_value_fields(overhead_budget.object.hours),:size => 10) %> +
    +

    <%= overhead_budget.label(:budget, l(:text_dollar_sign)) %>

    + <%= overhead_budget.text_field(:budget, :value => format_deliverable_value_fields(overhead_budget.object.budget), :size => 10) %> +
    + Todo: Add button (Release 3) +
    +
  • + + <%= form.input :total, :input_html => {:size => 10}, :wrapper_html => {:class => 'deliverable_total_input'}, :hint => l(:text_dollar_sign) %> + +<% end %> diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb index a9cb9a2..46ed70c 100644 --- a/app/views/deliverables/_form.html.erb +++ b/app/views/deliverables/_form.html.erb @@ -28,65 +28,7 @@ <% end %> <% end %> -<% form.inputs :name => l(:text_deliverable_finances), :id => 'deliverable-finances' do %> - -
  • - <%= content_tag(:label, l(:field_labor)) %> - - - <% form.fields_for :labor_budgets do |labor_budget| %> - - <%# TODO: Select field for the Time Entry Activity in a td %> - - - - <%# TODO: Green Add button for multiple records %> - - - <% end %> -
    - - -

    <%= labor_budget.label(:hours, l(:text_short_hours)) %>

    - <%= labor_budget.text_field(:hours, :value => format_deliverable_value_fields(labor_budget.object.hours), :size => 10) %> -
    -

    <%= labor_budget.label(:budget, l(:text_dollar_sign)) %>

    - <%= labor_budget.text_field(:budget, :value => format_deliverable_value_fields(labor_budget.object.budget), :size => 10) %> -
    - Todo: Add button (Release 3) -
    -
  • - -
  • - <%= content_tag(:label, l(:field_overhead)) %> - - - <% form.fields_for :overhead_budgets do |overhead_budget| %> - - <%# TODO: Select field for the Time Entry Activity in a td %> - - - - <%# TODO: Green Add button for multiple records %> - - - <% end %> -
    - - -

    <%= overhead_budget.label(:hours, l(:text_short_hours)) %>

    - <%= overhead_budget.text_field(:hours, :value => format_deliverable_value_fields(overhead_budget.object.hours),:size => 10) %> -
    -

    <%= overhead_budget.label(:budget, l(:text_dollar_sign)) %>

    - <%= overhead_budget.text_field(:budget, :value => format_deliverable_value_fields(overhead_budget.object.budget), :size => 10) %> -
    - Todo: Add button (Release 3) -
    -
  • - - <%= form.input :total, :input_html => {:size => 10}, :wrapper_html => {:class => 'deliverable_total_input'}, :hint => l(:text_dollar_sign) %> - -<% end %> +<%= render :partial => 'finance_form', :locals => {:form => form, :resource => resource} %>