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

[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..143f2d887106cb996406f62358b4d4e8f3429465 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,16 +1,14 @@
 <% 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="report">
+    <div class="float-left">
+      <%= link_to user_thumbnail(report.user), user_path(report.user) %>

     </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/>
+    <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>
   <hr>
 <% end %>
   </div>
   <hr>
 <% end %>