[#4600] Replaced todo and later release notes with icons

app/views/contracts/_title.html.erb

@@ -2,15 +2,15 @@
   <%= content_tag(:h2, h(contract.name)) %>
   
   <div class="title-bar-actions">
-    <span><a href="#TODO-release-4" class="">Log time (Release 4)</a></span>
+    <span><a href="#TODO-release-4" class=""><%= release(4, "Log time") %></a></span>
 
     <span class="meta-sep"> | </span>
     
-    <span id="watcher"><a class="icon icon-fav-off" href="#TODO-release-3" onclick="">Watch (Release 3)</a></span>
+    <span id="watcher"><a class="icon icon-fav-off" href="#TODO-release-3" onclick=""><%= release(3, "Watch") %></a></span>
 
     <span class="meta-sep"> | </span>
     
-    <span><a href="#TODO">Copy (Release ?)</a></span>
+    <span><a href="#TODO"><%= release(5, "Copy") %></a></span>
     <span class="meta-sep"> | </span>
     
     <div class="update button-large">
@@ -18,8 +18,3 @@
     </div>
   </div>
 </div>
-<%# TODO: release 3/4, contract messages
-    <div class="error_msg">
-             <p>There is $243 worth of time clocked to issues that are not assigned to any deliverables.  <span>Please update the orphaned issues.</span> </p>
-             </div>
-%>

app/views/contracts/index.html.erb

@@ -19,8 +19,8 @@
       <thead>
         <th><%= l(:field_id) %></th>
         <th><%= l(:field_name) %></th>
-        <%# TODO: Release 5, Status %>
-        <%# TODO: Release 5, Type %>
+        <th><%= l(:field_status) %></th>
+        <th><%= l(:field_type) %></th>
         <th><%= l(:field_account_executive_short) %></th>
         <th><%= l(:field_total_budget) %></th>
         <th><%= l(:field_end_date) %></th>
@@ -30,6 +30,8 @@
           <% content_tag_for(:tr, contract, :class => cycle('','odd')) do %>
             <td class="id"><%= link_to(h(contract.id), contract_path(@project, contract)) %></td>
             <td class="name"><%= link_to(h(contract.name), contract_path(@project, contract)) %></td>
+            <td><%= release(5, "Contract Status") %></td>
+            <td><%= release(5, "Contract Type") %></td>
             <td class="account-executive"><%= h contract.account_executive.name %></td>
             <td class="total-budget"><%= h(format_value_field_for_contracts(contract.total_budget)) %></td>
             <td class="end-date"><%= h format_date(contract.end_date) %></td>
@@ -43,9 +45,8 @@
     <h2>Inactive Contracts</h2>
   </div>
 
-  <%# TODO: split contracts by active and inactive %>
   <p class="nodata"><%= l(:label_no_data) %></p>
-  <p>TODO: Release 5 (Contract Status)</p>
+  <p><%= release(5, "Contract Status. Split contracts by active and inactive") %></p>
 
 </div>
 

app/views/contracts/show.html.erb

@@ -15,9 +15,16 @@
 
   <div class="c_overview">
     <table class="left">
-      <%= show_field(resource, :status, :html_options => {:class => 'contract-status'}) %>
+      <tr class="contract-status">
+        <%# show_field(resource, :status, :html_options => {:class => 'contract-status'}) %>
+        <td colspan="2"><%= release(5, "Contract status") %></td>
+      </tr>
       <%= show_field(resource, :account_executive, :html_options => {:class => 'contract-account-manager'}) %>
-      <%= show_field(resource, :contract_type, :html_options => {:class => 'contract-type'}) %>
+      <tr class="contract-type">
+        <%# show_field(resource, :contract_type, :html_options => {:class => 'contract-type'}) %>
+        <td colspan="2"><%= release(5, "Contract type") %></td>
+      </tr>
+      
     </table>
     
     <table class="middle">
@@ -57,7 +64,10 @@
         <%= show_budget_field(resource, :fixed_markup_spent, :fixed_markup_budget, :format => :format_value_field_for_contracts, :html_options => {:class => 'contract-markup'}) %>
         <% end %>
         <%= show_budget_field(resource, :profit_spent, :profit_budget, :format => :format_value_field_for_contracts, :html_options => {:class => 'contract-profit'}) %>
-        <%= show_budget_field(resource, :discount_spent, :discount_budget, :format => :format_value_field_for_contracts, :html_options => {:class => 'contract-discount'}) %>
+        <tr class="contract-discount">
+          <%# show_budget_field(resource, :discount_spent, :discount_budget, :format => :format_value_field_for_contracts, :html_options => {:class => 'contract-discount'}) %>
+          <td colspan="3"><%= release(4, "Discount") %></td>
+        </tr>
 
         <tr>
           <td colspan="3">
@@ -81,8 +91,8 @@
     <%= content_tag(:h3, l(:field_deliverable_plural)) %>
 
     <div class="actions">
-      <a href="#TODO-release-2">CSV (Release 2)</a>
-      <a href="#TODO-release?">View All (9) (Release ?)</a>
+      <a href="#TODO-release-2"><%= release(2, "CSV") %></a>
+      <a href="#TODO-release?"><%= release(5, "View All/Pagination") %></a>
       <%= link_to(l(:button_add_new), new_contract_deliverable_path(@project, resource), :id => 'new-deliverable') %>
     </div>
 
@@ -111,7 +121,7 @@
               <td width="10%" class="arrow end-date"><span><%= h format_date(deliverable.end_date) %></span></td>
               <td width="2%" class="type"><%= h deliverable.short_type %></td>
               <td width="25%" class="title"><%= h deliverable.title %></td>
-              <td width="15%">TODO: Release 5</td>
+              <td width="15%"><%= release(5, "Deliverable status") %></td>
               <td width="15%" class="manager"><%= h deliverable.manager.try(:name) %></td>
               <%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total, :class => 'labor') %>
               <%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total, :class => 'overhead') %>
@@ -130,7 +140,7 @@
   </div>
   
 <% end %> <%# div_for(resource) %>
-<p>TODO: Release 4, Milestones</p>
+<p><%= release(4, "Milestones") %></p>
 <!--
      <div id="milestones">
        
@@ -205,6 +215,6 @@
      </div>
      -->
 
-<p>TODO: Release 2+, history</p>
+<p><%= release(3, "history") %></p>
 
 <% html_title "#{l(:text_contracts)} - #{h(resource.name)}" %>