Merge remote-tracking branch 'upstream/pull/2023'

[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 e9f8ac3cc467c4df02828ad36f383298104746a7..36b454188f09a88b9626319e42e68887823e3d0c 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -1,20 +1,20 @@
-<% @title = t('redaction.show.title') %>
-<h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+<% @title = t('.title') %>
+<% content_for :heading do %>
+  <h1><%= t('.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}) %>
+  <b><%= t '.user' %></b>
+  <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
-<p>
-  <b><%= t 'redaction.show.description' %></b>
+<div class="richtext">
+  <b><%= t '.description' %></b>
   <%= @redaction.description.to_html %>
-</p>
+</div>
 
-<% 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, :confirm => t('redaction.show.confirm'), :method => "delete", :remote => true %></td>
-</tr>
-</table>
+<% if current_user and current_user.moderator? %>
+<div class="buttons">
+  <%= button_to t('.edit'), edit_redaction_path(@redaction), :method => :get %></td>
+  <%= button_to t('.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('.confirm') } %>
+</div>
 <% end %>