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

[rails.git] / app / views / diary_entries / comments.html.erb

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 4c4fd01e9f0efa03003b877932e9e1fd9e78e3d0..56dba30b875d81d9f37eab7654c323167ee61ae9 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -10,9 +10,9 @@
   </tr>
   <% @comments.each do |comment| -%>
   <% cl = cycle("table0", "table1") %>
   </tr>
   <% @comments.each do |comment| -%>
   <% cl = cycle("table0", "table1") %>

-  <tr class="<%= cl %>">
+  <tr class="<%= cl %><%= " deemphasize" unless comment.visible? %>">

     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>

-    <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t ".ago", :ago => time_ago_in_words(comment.created_at) %></span></td>
+    <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %></span></td>

     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>