dinislage/redmine_contracts
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Davis committed 2010-10-05 10:39:44 -07:00
1 parent b0b434dbfb
commit 5a277c723f
13 files changed
+48 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/deliverables/_details_row.html.erb
+8 -8
View File
@@ -24,21 +24,21 @@
<table>
<%= show_field(deliverable, :current_period, :html_options => {:class => 'deliverable-current-period'}) if deliverable.retainer? %>
<tr><td colspan="2"><%= release(5, "Retainer lightbox") %></td></tr>
<%= show_field(deliverable, :start_date, :format => :format_date, :html_options => {:class => 'deliverable-start-date'}) %>
<%= show_field(deliverable, :end_date, :format => :format_date, :html_options => {:class => 'deliverable-end-date'}) %>
</table>
</div>
<%# TODO: Release 2, skinning port %>
<div class="finance">
<table>
<thead>
<tr>
<th> </th>
<th>Spent</th>
<th>Budget</th>
<th>Hours</th>
<th><%= l(:field_spent) %></th>
<th><%= l(:field_budget) %></th>
<th><%= l(:field_hours) %></th>
</tr>
</thead>
<tfoot>
@@ -51,7 +51,7 @@
</tfoot>
<tbody>
<tr>
<td class="l"><a href="#"><strong>Labor</strong></a></td>
<td class="l"><a href="#"><strong><%= l(:field_labor) %></strong></a><%= release(3, "Deliverable lightbox") %></td>
<td class="labor_budget_spent"><%= h(format_value_field_for_contracts(deliverable.labor_budget_spent(validated_period))) %></td>
<td class="labor_budget_total"><%= h(format_value_field_for_contracts(deliverable.labor_budget_total(validated_period))) %></td>
<td class="labor_hours">
@@ -59,7 +59,7 @@
</td>
</tr>
<tr>
<td class="l"><a href="#"><strong>Overhead</strong></a></td>
<td class="l"><a href="#"><strong><%= l(:field_overhead) %></strong></a><%= release(3, "Deliverable lightbox") %></td>
<td class="overhead_budget_spent"><%= h(format_value_field_for_contracts(deliverable.overhead_spent(validated_period))) %></td>
<td class="overhead_budget_total"><%= h(format_value_field_for_contracts(deliverable.overhead_budget_total(validated_period))) %></td>
<td class="overhead_hours">
@@ -87,13 +87,13 @@
<% end %>
<tr>
<td class="l">Profit</td>
<td class="l"><%= l(:field_profit) %></td>
<td><%= h(format_value_field_for_contracts(deliverable.profit_left(validated_period))) %></td>
<td><%= h(format_value_field_for_contracts(deliverable.profit_budget(validated_period))) %></td>
<td></td>
</tr>
<tr class="total">
<td class="l"><strong>Total:</strong></td>
<td class="l"><strong><%= l(:field_total) %>:</strong></td>
<td class="total_spent"><strong><%= h(format_value_field_for_contracts(deliverable.total_spent(validated_period))) %></strong></td>
<td class="total"><strong><%= h(format_value_field_for_contracts(deliverable.total(validated_period))) %></strong></td>
<td class="total_hours">
app/views/deliverables/_finance_form.html.erb
+5 -9
View File
@@ -12,9 +12,8 @@
<%= labor_budget.hidden_field(:year) %>
<%= labor_budget.hidden_field(:month) %>
<tr>
<%# TODO: Select field for the Time Entry Activity in a td %>
<td>
<select><option>TODO: Release 3</option></select>
<%= release(3, "Select field for the Time Entry Activity in a td") %>
</td>
<td>
<p class="inline-hints"><%= labor_budget.label(:hours, l(:text_short_hours)) %></p>
@@ -24,9 +23,8 @@
<p class="inline-hints"><%= labor_budget.label(:budget, l(:text_dollar_sign)) %></p>
<%= labor_budget.text_field(:budget, :value => format_deliverable_value_fields(labor_budget.object.budget), :class => 'financial') %>
</td>
<%# TODO: Green Add button for multiple records %>
<td>
Todo: Add button (Release 3)
<%= release(3, "Green Add button for multiple records") %>
</td>
</tr>
<% end %>
@@ -41,9 +39,8 @@
<%= overhead_budget.hidden_field(:year) %>
<%= overhead_budget.hidden_field(:month) %>
<tr>
<%# TODO: Select field for the Time Entry Activity in a td %>
<td>
<select><option>TODO: Release 3</option></select>
<%= release(3, "Select field for the Time Entry Activity in a td") %>
</td>
<td>
<p class="inline-hints"><%= overhead_budget.label(:hours, l(:text_short_hours)) %></p>
@@ -53,9 +50,8 @@
<p class="inline-hints"><%= overhead_budget.label(:budget, l(:text_dollar_sign)) %></p>
<%= overhead_budget.text_field(:budget, :value => format_deliverable_value_fields(overhead_budget.object.budget), :class => 'financial') %>
</td>
<%# TODO: Green Add button for multiple records %>
<td>
Todo: Add button (Release 3)
<%= release(3, "Green Add button for multiple records") %>
</td>
</tr>
<% end %>
@@ -95,7 +91,7 @@
<%= 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}" %>
<p>Todo: Add button (Release 3)</p>
<p><%= release(3, "Green Add button for multiple records") %></p>
<% end %>
</div>