[#4178] Fixing integration tests based on the UI changes.

app/views/contracts/show.html.erb

@@ -80,7 +80,7 @@
     <% if resource.deliverables.empty? %>
       <p class="nodata"><%= l(:label_no_data) %></p>
     <% else %>
-      <table width="100%" id="texpand">
+      <table width="100%" class="texpand" id="deliverables">
         <thead>
           <tr>
             <th><%= l(:field_end_date) %></th>
@@ -107,7 +107,7 @@
               <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Release 2, Fixed Budgets %>
             <% end %>
 
-            <tr class="ign">
+            <tr id="deliverable_details_<%= h(deliverable.id) %>" class="ign">
               <td colspan="11">
                 
                 <div class="expanded">

app/views/deliverables/_form.html.erb

@@ -27,7 +27,7 @@
 
   <li class="numeric optional">
     <%= content_tag(:label, l(:field_labor)) %>
-    <table class="deliverable_finance_table">
+    <table id="deliverable-labor" class="deliverable_finance_table">
 
       <% form.fields_for :labor_budgets do |labor_budget| %>
       <tr>
@@ -36,11 +36,11 @@
           <select><option>TODO: Release 3</option></select>
         </td>
         <td>
-          <p class="inline-hints"><%= l(:text_short_hours) %></p>
+          <p class="inline-hints"><%= labor_budget.label(:hours, l(:text_short_hours)) %></p>
           <%= labor_budget.text_field(:hours, :size => 10) %>
         </td>
         <td>
-          <p class="inline-hints"><%= l(:text_dollar_sign) %></p>
+          <p class="inline-hints"><%= labor_budget.label(:budget, l(:text_dollar_sign)) %></p>
           <%= labor_budget.text_field(:budget, :size => 10) %>
         </td>
         <%# TODO: Green Add button for multiple records %>
@@ -54,7 +54,7 @@
 
   <li class="numeric optional">
     <%= content_tag(:label, l(:field_overhead)) %>
-    <table class="deliverable_finance_table">
+    <table id="deliverable-overhead" class="deliverable_finance_table">
       
       <% form.fields_for :overhead_budgets do |overhead_budget| %>
       <tr>
@@ -63,11 +63,11 @@
           <select><option>TODO: Release 3</option></select>
         </td>
         <td>
-          <p class="inline-hints"><%= l(:text_short_hours) %></p>
+          <p class="inline-hints"><%= overhead_budget.label(:hours, l(:text_short_hours)) %></p>
           <%= overhead_budget.text_field(:hours, :size => 10) %>
         </td>
         <td>
-          <p class="inline-hints"><%= l(:text_dollar_sign) %></p>
+          <p class="inline-hints"><%= overhead_budget.label(:budget, l(:text_dollar_sign)) %></p>
           <%= overhead_budget.text_field(:budget, :size => 10) %>
         </td>
         <%# TODO: Green Add button for multiple records %>