Move html_safe declaration for user_mailer from layout to helper

[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 c5dbcb9b50bdb36019e198ec8d9592fbd6282da7..2d0f1650bdf4f3c2040c0c8c09086f7641ef7f92 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,20 +1,17 @@
 <% reports.each do |report| %>
 <% 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="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 %>
 <% end %>