Merge branch 'master' into next

[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 01c34efe1a5631de6e650946c63f3bfc198864ad..b499288a2446d4059afcc8ea5ed0f415ade6c460 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,9 +1,10 @@
 <% reports.each do |report| %>
 <% reports.each do |report| %>

-  <div class="reports">
+  <div class="report">

     <div style="float:left">
     <div style="float:left">

-      <%= link_to user_thumbnail(report.user), :controller => :user, :action =>:view, :display_name => report.user.display_name %>
+      <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>

     </div>
     </div>

-    <%= t(".reported_by_html", :category => report.category, :user_name => report.user.display_name, :user_url => url_for(:controller => :user, :action => :view, :display_name => report.user.display_name)) %> <br/>
+    <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
+    <br/>

     <span class="deemphasize">
       <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>
     <span class="deemphasize">
       <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>