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

[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 0a55a59ec2717391712445725955faba12066f6e..2d0f1650bdf4f3c2040c0c8c09086f7641ef7f92 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,11 +1,17 @@
 <% reports.each do |report| %>
-       <div class="reports">
-               <div class="display:inline">
-                       <%= user_thumbnail report.user %>
-                       <%= report.details %>
-               </div>
-               <span class="deemphasize"><%= raw(t('Reported by:',:link_user => (link_to h(report.user.display_name), :controller => :user, :action => :view, :display_name => report.user.display_name), :comment_created_at => link_to(l(report.created_at,:format => :friendly)))) %>
-               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), 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>
+  <hr>
 <% end %>