Merge branch 'master' into HEAD

[rails.git] / app / views / issues / _reports.html.erb

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 68e69ee72570f83b9a81d1d15c7aa9523e9fbe1e..b1b690f8c965ec5d93c5113b03498181e3aba2dc 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,15 +1,16 @@
 <% reports.each do |report| %>
-  <div class="reports">
-    <div style="float:left">
-      <%= link_to user_thumbnail(report.user), :controller => :user, :action =>:view, :display_name => report.user.display_name %>
+  <div class="row">
+    <div class="col-auto">
+      <%= link_to user_thumbnail(report.user), user_path(report.user) %>
+    </div>
+    <div class="col">
+      <p class="text-muted mb-0">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, user_path(report.user)),
+                                   :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
+      </p>
+      <p><%= report.details %></p>
     </div>
-    Reported by <b><%= link_to report.user.display_name, :controller => :user, :action =>:view, :display_name => report.user.display_name %></b> <br/>
-    <span class="deemphasize">
-      On <%= l report.updated_at.to_datetime, :format => :friendly %>
-    </span>
-    <br/>
-    <%= report.details %>
-    <br/>
   </div>
   <hr>
 <% end %>