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

[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 29b7e94d1e80138b3de22669e55815f27fa06baa..9ef28f1c29007c06664aed58894350b90fcc0081 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,13 +1,17 @@
 <% reports.each do |report| %>
 <% 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>
-               <b><%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %></b> <br/>
-               <%= report.details %>
-               <br/>
-               <span class="deemphasize">
-               On <%= l report.created_at.to_datetime, :format => :long %> </span>
-       </div>
-       <hr>
+  <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">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, user_path(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>
+  </div>
+  <hr>

 <% end %>
 <% end %>