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

[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 99f7cd1f1a42d834434f3ab37cfa72b8607d65ed..1eb20f16f1564ce0350d51bb5f3d802a0822d72e 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -1,20 +1,24 @@
-<% @title = t('redaction.show.title') %>
+<% @title = t(".title") %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('redaction.show.heading', :title => @redaction.title) %></h1>
+  <h1><%= t(".heading", :title => @redaction.title) %></h1>

 <% end %>
 
 <p>
 <% end %>
 
 <p>

-  <b><%= t 'redaction.show.user' %></b>
+  <b><%= t ".user" %></b>

   <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
   <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>

-<p class="richtext">
-  <b><%= t 'redaction.show.description' %></b>
+<div class="richtext">
+  <b><%= t ".description" %></b>

   <%= @redaction.description.to_html %>
   <%= @redaction.description.to_html %>

-</p>
+</div>

 
 

-<% if current_user and current_user.moderator? %>
+<% if can?(:edit, Redaction) || can?(:destroy, Redaction) %>

 <div class="buttons">
 <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') } %>
+  <% if can?(:edit, Redaction) %>
+    <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td>
+  <% end %>
+  <% if can?(:destroy, Redaction) %>
+    <%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %>
+  <% end %>

 </div>
 <% end %>
 </div>
 <% end %>