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

[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 cf5116edebe36aca4ef3d923454804f3d4af4099..5b9749a5113b7f2c3caa686b98c84b7b3103c75a 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -5,7 +5,7 @@
 
 <p>
   <b><%= t ".user" %></b>
 
 <p>
   <b><%= t ".user" %></b>

-  <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
+  <%= link_to @redaction.user.display_name, @redaction.user %>

 </p>
 <div class="richtext text-break">
   <b><%= t ".description" %></b>
 </p>
 <div class="richtext text-break">
   <b><%= t ".description" %></b>


@@ -13,12 +13,12 @@
 </div>
 
 <% if can?(:edit, Redaction) || can?(:destroy, Redaction) %>
 </div>
 
 <% if can?(:edit, Redaction) || can?(:destroy, Redaction) %>

-<div class="buttons">
+<div>

   <% if can?(:edit, Redaction) %>
   <% if can?(:edit, Redaction) %>

-    <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td>
+    <%= link_to t(".edit"), edit_redaction_path(@redaction), :class => "btn btn-outline-primary" %>

   <% end %>
   <% if can?(:destroy, Redaction) %>
   <% end %>
   <% if can?(:destroy, Redaction) %>

-    <%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %>
+    <%= link_to t(".destroy"), @redaction, :method => "delete", :class => "btn btn-outline-danger", :remote => true, :data => { :confirm => t(".confirm") } %>

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