From 66f3a07e75265be7740f11f16b21f306f4ce0117 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 9 Aug 2010 11:49:42 -0700 Subject: [PATCH] [#4178] TODO flagging sections of the views with their release version. --- app/views/contracts/_title.html.erb | 8 +++---- app/views/contracts/index.html.erb | 5 +++-- app/views/contracts/show.html.erb | 27 ++++++++++++------------ app/views/deliverables/_form.html.erb | 12 +++++++++++ assets/stylesheets/redmine_contracts.css | 2 +- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/app/views/contracts/_title.html.erb b/app/views/contracts/_title.html.erb index 1a735ac..575398b 100644 --- a/app/views/contracts/_title.html.erb +++ b/app/views/contracts/_title.html.erb @@ -2,15 +2,15 @@ <%= content_tag(:h2, h(contract.name)) %>
- Log time + Log time (Release 4) | - Watch + Watch (Release 3) | - Copy + Copy (Release ?) |
@@ -18,7 +18,7 @@
-<%# TODO: contract messages +<%# TODO: release 3/4, contract messages

There is $243 worth of time clocked to issues that are not assigned to any deliverables. Please update the orphaned issues.

diff --git a/app/views/contracts/index.html.erb b/app/views/contracts/index.html.erb index 406e124..465720d 100644 --- a/app/views/contracts/index.html.erb +++ b/app/views/contracts/index.html.erb @@ -19,8 +19,8 @@ <%= l(:field_id) %> <%= l(:field_name) %> - <%# TODO: Status %> - <%# TODO: Type %> + <%# TODO: Release 5, Status %> + <%# TODO: Release 5, Type %> <%= l(:field_account_executive_short) %> <%= l(:field_total_budget) %> <%= l(:field_end_date) %> @@ -45,5 +45,6 @@ <%# TODO: split contracts by active and inactive %>

<%= l(:label_no_data) %>

+

TODO: Release 5 (Contract Status)

diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb index a9306fb..1481c9f 100644 --- a/app/views/contracts/show.html.erb +++ b/app/views/contracts/show.html.erb @@ -70,8 +70,8 @@ <%= content_tag(:h3, l(:field_deliverable_plural)) %>
- CSV - View All (9) + CSV (Release 2) + View All (9) (Release ?) <%= link_to(l(:button_add_new), new_contract_deliverable_path(@project, resource), :id => 'new-deliverable') %>
@@ -100,11 +100,11 @@ <%= h format_date(deliverable.end_date) %> <%= h deliverable.short_type %> <%= h deliverable.title %> - TODO + TODO: Release 5 <%= h deliverable.manager.try(:name) %> <%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total) %> <%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total) %> - <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Fixed %> + <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Release 2, Fixed Budgets %> <% end %> @@ -126,7 +126,7 @@ - <%# TODO: skinning port %> + <%# TODO: Release 2, skinning port %>
@@ -150,16 +150,16 @@ - + - + - <%# TODO: Fixed %> - <%# TODO: Markup %> + <%# TODO: Release 2, Fixed %> + <%# TODO: Release 2, Markup %> @@ -170,7 +170,7 @@ - +
Labor <%= h(deliverable.labor_budget_spent) %> <%= h(deliverable.labor_budget_total) %> TODO / TODO hrs TODO: Release 2 / TODO hrs
Overhead <%= h(deliverable.overhead_spent) %> <%= h(deliverable.overhead_budget_total) %> TODO / TODO hrs TODO: Release 2 / TODO hrs
Profit <%= h(deliverable.profit_left) %>Total: <%= h(deliverable.total_spent) %> <%= h(deliverable.total) %>TODOTODO: Release 2
@@ -183,7 +183,7 @@ <%= l(:label_issue_status_plural) %> - <%# TODO: Issue status counters + <%# TODO: Release 2 Issue status counters Proposed 1 @@ -216,7 +216,8 @@
<% end %> <%# div_for(resource) %> - -<%# TODO: history %> +

TODO: Release 2+, history

diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb index daa4705..d20f4a8 100644 --- a/app/views/deliverables/_form.html.erb +++ b/app/views/deliverables/_form.html.erb @@ -32,6 +32,9 @@ <% form.fields_for :labor_budgets do |labor_budget| %> <%# TODO: Select field for the Time Entry Activity in a td %> + + +

<%= l(:text_short_hours) %>

<%= labor_budget.text_field(:hours, :size => 10) %> @@ -41,6 +44,9 @@ <%= labor_budget.text_field(:budget, :size => 10) %> <%# TODO: Green Add button for multiple records %> + + Todo: Add button (Release 3) + <% end %> @@ -53,6 +59,9 @@ <% form.fields_for :overhead_budgets do |overhead_budget| %> <%# TODO: Select field for the Time Entry Activity in a td %> + + +

<%= l(:text_short_hours) %>

<%= overhead_budget.text_field(:hours, :size => 10) %> @@ -62,6 +71,9 @@ <%= overhead_budget.text_field(:budget, :size => 10) %> <%# TODO: Green Add button for multiple records %> + + Todo: Add button (Release 3) + <% end %> diff --git a/assets/stylesheets/redmine_contracts.css b/assets/stylesheets/redmine_contracts.css index 05a187c..6a88205 100644 --- a/assets/stylesheets/redmine_contracts.css +++ b/assets/stylesheets/redmine_contracts.css @@ -104,7 +104,7 @@ padding-left: 0px; /* Don't pad submit buttons */ } #content table.deliverable_finance_table{ - width: 400px; + width: 600px; } #content table.deliverable_finance_table select{