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

[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..427cbe9091a5b06c78a091b10c126a15bd34d246 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,11 +1,16 @@
 <% 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="report">
+    <div style="float:left">
+      <%= link_to user_thumbnail(report.user), user_path(report.user) %>
+    </div>
+    <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
+    <br/>
+    <span class="deemphasize">
+      <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
+    </span>
+    <br/>
+    <%= report.details %>
+    <br/>
+  </div>
+  <hr>
 <% end %>