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 94ae3ca0e5d15fabcac5f0ba41e34e8dc36c5010..143f2d887106cb996406f62358b4d4e8f3429465 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,20 +1,14 @@
 <% 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/>
-               <% details =  report.details.split("--||--") %>
-               <%= details[0] %> 
-               <br/>
-               <br/>
-               <label>Tags:</label> 
-               <% details[1..(details.size-1)].each do |tags| %>
-                       <%= tags %>
-               <% end %>
-               <br/>
-               <span class="deemphasize">
-               On <%= l report.created_at.to_datetime, :format => :long %> </span>
-       </div>
-       <hr>
+  <div class="report">
+    <div class="float-left">
+      <%= link_to user_thumbnail(report.user), user_path(report.user) %>
+    </div>
+    <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 %>