Fixed some merge bugs. #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2009-10-21 22:35:03 +00:00
parent 2e0cbd2840
commit ff3d0fe4db
5 changed files with 10 additions and 8 deletions
+2 -2
View File
@@ -16,8 +16,8 @@
<% enumerations.each do |enumeration| %>
<tr class="<%= cycle('odd', 'even') %>">
<td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
<td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
<td style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
<td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
<td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
<td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
<td class="buttons">
<%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },