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

[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 5303ae0c5ea3e408f82712f1bd8f9a147a4bcff1..2d1b78800688bcb17d024b1d603c83fed890dd36 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,19 +1,17 @@
 <% 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), report.user %>
+    </div>
+    <div class="col">
+      <p class="text-muted">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, report.user),
+                                   :updated_at => tag.time(l(report.updated_at.to_datetime, :format => :friendly),
+                                                           :datetime => report.updated_at.xmlschema) %>
+      </p>
+      <div class="richtext text-break"><%= report.details.to_html %></div>
     </div>
-    <%= t(".reported_by_html", :user_name => report.user.display_name, :user_url => url_for(:controller => :user, :action => :view, :display_name => report.user.display_name)) %> <br/>
-    <span class="deemphasize">
-      <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
-    </span>
-    <br/>
-    <span class="deemphasize">
-      <%= t ".category", category: report.category %>
-    </span>
-    <br/>
-    <%= report.details %>
-    <br/>
   </div>
   <hr>
 <% end %>