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

[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..5b9749a5113b7f2c3caa686b98c84b7b3103c75a 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -1,16 +1,24 @@
-<% @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, @redaction.user %>
 </p>
-<p>
-  <b><%= t 'redaction.show.description' %></b>
+<div class="richtext text-break">
+  <b><%= t ".description" %></b>
   <%= @redaction.description.to_html %>
-</p>
+</div>
 
-<% 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 can?(:edit, Redaction) || can?(:destroy, Redaction) %>
+<div>
+  <% if can?(:edit, Redaction) %>
+    <%= link_to t(".edit"), edit_redaction_path(@redaction), :class => "btn btn-outline-primary" %>
+  <% end %>
+  <% if can?(:destroy, Redaction) %>
+    <%= link_to t(".destroy"), @redaction, :method => "delete", :class => "btn btn-outline-danger", :remote => true, :data => { :confirm => t(".confirm") } %>
+  <% end %>
+</div>
 <% end %>