Merge pull request #37 from finnlabs/feature/rails3_fix_layout

Feature/rails3 fix layout
pull/6827/head
ulferts 12 years ago
commit 713ac0d225
  1. 2
      app/models/cost_object.rb
  2. 5
      app/views/cost_objects/_list.html.erb
  3. 2
      config/locales/de.yml

@ -121,7 +121,7 @@ class CostObject < ActiveRecord::Base
end
def css_classes
return "issue cost_object"
return "cost_object"
end
def self.replace_author_with_deleted_user(user)

@ -15,8 +15,7 @@
<% cost_objects.each do |cost_object| %>
<tr id="cost_object-<%= cost_object.id %>" class="<%= cycle('odd', 'even') %> <%= cost_object.css_classes %>">
<td><%= link_to cost_object.id, cost_object_path(cost_object.id) %></td>
<%= content_tag(:td, l(cost_object.status), :class => 'status') %>
<%= content_tag(:td, link_to(h(cost_object.subject), cost_object_path(cost_object.id), :class => 'subject')) %>
<%= content_tag(:td, link_to(h(cost_object.subject), cost_object_path(cost_object.id)), :class => 'subject') %>
<%= content_tag(:td, number_to_currency(cost_object.budget, :precision => 0), :class => 'currency') %>
<%= content_tag(:td, number_to_currency(cost_object.spent, :precision => 0), :class => 'currency') %>
<%= content_tag(:td, number_to_currency(cost_object.budget - cost_object.spent, :precision => 0), :class => 'currency') %>
@ -31,7 +30,7 @@
<% end %>
<% if cost_objects.length > 0 %>
<tr>
<td colspan="4" />
<td colspan="2" />
<td class="currency"><strong><%= number_to_currency( total_budget, :precision => 0) %></strong></td>
<td class="currency"><strong><%= number_to_currency( spent, :precision => 0) %></strong></td>
<td class="currency"><strong><%= number_to_currency( total_budget - spent, :precision => 0) %></strong></td>

@ -26,7 +26,7 @@ de:
project_manager_signoff: Genehmigt vom Projektmanager
client_signoff: Genehmigt vom Kunden
fixed_date: Referenzdatum
planned: Geplant
budget: Geplant
spent: Verbraucht
available: Verfügbar
status: Status

Loading…
Cancel
Save