Merge branch 'master' into moderation

[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 162dd6bfe4617e07bab76e44c6d512134b710d4a..99f7cd1f1a42d834434f3ab37cfa72b8607d65ed 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -1,16 +1,20 @@
 <% @title = t('redaction.show.title') %>
-<h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+<% content_for :heading do %>
+  <h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+<% end %>
 
 <p>
   <b><%= t 'redaction.show.user' %></b>
-  <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
+  <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
-<p>
+<p class="richtext">
   <b><%= t 'redaction.show.description' %></b>
   <%= @redaction.description.to_html %>
 </p>
 
-<% if @user and @user.moderator? %>
-<%= link_to t('redaction.show.edit'), edit_redaction_path(@redaction) %>
-<%= button_to(t('redaction.show.destroy'), @redaction, :confirm => t('redaction.show.confirm'), :method => "delete", :remote => true) %>
+<% if current_user and current_user.moderator? %>
+<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 %>