Merge branch 'master' into moderation

[rails.git] / app / views / notes / _description.html.erb

diff --git a/app/views/notes/_description.html.erb b/app/views/notes/_description.html.erb
index 761b69ea2db87fc7dd0528a1188a0705243328f0..4f03a1d59aadf32973468a5dc53d37109483199c 100644 (file)
--- a/app/views/notes/_description.html.erb
+++ b/app/views/notes/_description.html.erb
@@ -1,12 +1,3 @@
 <div>
 <div>

-  <% description.comments.each do |comment| -%>
-  <div class="note-comment" style="margin-top: 5px">
-    <% if comment.author.nil? -%>
-    <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at", :when => friendly_date(comment.created_at) %></div>
-    <% else -%>
-    <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
-    <% end -%>
-    <div class="note-comment-text"><%= comment.body %></div>
-  </div>
-  <% end -%>
+  <%= render :partial => "comment", :collection => description.comments %>

 </div>
 </div>