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

[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 97d1ec793c035a17e8a6482364376e1d326b89c6..2d0f1650bdf4f3c2040c0c8c09086f7641ef7f92 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,16 +1,17 @@
 <% reports.each do |report| %>
 <% reports.each do |report| %>

-  <% details =  report.details.split("--||--") %>
-  <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-body-secondary">
+        <%= 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>
     </div>

-    Reported as <b><%= details[1].delete('[').delete(']').downcase %></b> 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/>
-    <%= details[0] %>
-    <br/>

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