Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
9a986ac0a5
commit
fe28193e4e
237 files changed
+27994
-32194
No files matched your search
@@ -10,12 +10,12 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
|
||||
<td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(lwr(:label_f_hour, @version.estimated_hours)) %></td>
|
||||
<td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
|
||||
</tr>
|
||||
<% if User.current.allowed_to?(:view_time_entries, @project) %>
|
||||
<tr>
|
||||
<td width="130px" align="right"><%= l(:label_spent_time) %></td>
|
||||
<td width="240px" class="total-hours"><%= html_hours(lwr(:label_f_hour, @version.spent_hours)) %></td>
|
||||
<td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
|
||||
Reference in new issue
Block a user