From 5463b4500de4e51f15799452143830c3b24b9731 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 13 Oct 2011 13:47:27 -0700 Subject: [PATCH] [#6636] Style the finance report summary --- app/views/deliverables/_finances.html.erb | 2 +- assets/stylesheets/redmine_contracts.css | 2 ++ test/integration/deliverable_finances_test.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/deliverables/_finances.html.erb b/app/views/deliverables/_finances.html.erb index 2dd0dfa..bb95dd6 100644 --- a/app/views/deliverables/_finances.html.erb +++ b/app/views/deliverables/_finances.html.erb @@ -1,4 +1,4 @@ -
+
<%= l(:text_deliverable_spending_summary, :spent => content_tag(:span, h(number_to_currency(deliverable.labor_budget_spent, :precision => Deliverable::ViewPrecision)), :class => 'spent'), :total => content_tag(:span, h(number_to_currency(deliverable.labor_budget_total, :precision => Deliverable::ViewPrecision)), :class => 'total'), diff --git a/assets/stylesheets/redmine_contracts.css b/assets/stylesheets/redmine_contracts.css index 207eac5..870c1fb 100644 --- a/assets/stylesheets/redmine_contracts.css +++ b/assets/stylesheets/redmine_contracts.css @@ -533,3 +533,5 @@ table.striped-contract-style tr.summary-row { div.fixed-budget-form {padding: 5px 0;} .deliverable-action-link { font-weight: bold; } .deliverable-finance-report { float: left; padding: 0 5px; } +#finance-summary { font-size: 1.2em; color: #666666; } +#finance-summary span { padding: 0; font-weight: bold; color: #000000; } diff --git a/test/integration/deliverable_finances_test.rb b/test/integration/deliverable_finances_test.rb index be2007f..6a9030f 100644 --- a/test/integration/deliverable_finances_test.rb +++ b/test/integration/deliverable_finances_test.rb @@ -71,7 +71,7 @@ class DeliverableFinancesShowTest < ActionController::IntegrationTest should "render the finance report title section for the deliverable" do assert_select "h2", :text => /#{@deliverable1.title}/ - assert_select "div#summary" do + assert_select "div#finance-summary" do assert_select "span.spent", :text => /\$200/ # $100 * 2 assert_select "span.total", :text => /\$300/ # $100 * 3 assert_select "span.hours", :text => /2/