Resolve conflict

[rails.git] / app / views / redactions / show.html.erb

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index 798ed962a58d68092ce00af8da186279122a5c3d..174fe97e4f60559a02c57509d997b4c375a53591 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -7,16 +7,14 @@
   <b><%= t 'redaction.show.user' %></b>
   <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
 </p>
-<p>
+<p class="richtext">
   <b><%= t 'redaction.show.description' %></b>
   <%= @redaction.description.to_html %>
 </p>
 
 <% if @user and @user.moderator? %>
-<table>
-<tr>
-<td><%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %></td>
-<td><%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %></td>
-</tr>
-</table>
+<div class="buttons">  
+  <%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %></td>
+  <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %>
+</div>
 <% end %>