diff --git a/app/helpers/contracts_helper.rb b/app/helpers/contracts_helper.rb index f387247..5f496e9 100644 --- a/app/helpers/contracts_helper.rb +++ b/app/helpers/contracts_helper.rb @@ -8,9 +8,8 @@ module ContractsHelper def format_budget_for_deliverable(deliverable, spent, total) if total > 0 || spent > 0 - content_tag(:span, h(number_to_currency(spent, :unit => '')), :class => 'spent-amount') + - " " + - content_tag(:span, h(number_to_currency(total, :unit => '')), :class => 'total-amount') + content_tag(:div, h(number_to_currency(spent, :unit => '')), :class => 'spent-amount') + + content_tag(:div, h(number_to_currency(total, :unit => '')), :class => 'total-amount') else '---' end diff --git a/assets/stylesheets/redmine_contracts.css b/assets/stylesheets/redmine_contracts.css index aa42952..7f01cb4 100644 --- a/assets/stylesheets/redmine_contracts.css +++ b/assets/stylesheets/redmine_contracts.css @@ -23,3 +23,6 @@ a.contract-delete {color: red; } /* Positioning */ #deliverable-finances ol li { display: inline; } #deliverable-finances ol li label { float: none; margin-left: 0; } + +#deliverables td.labor, #deliverables td.overhead, #deliverables td.fixed { text-align: center; } +#deliverables td.labor div, #deliverables td.overhead div, #deliverables td.fixed div { text-align: right; display: inline; padding: 0 5px; width: 50%; }