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

[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 10028bdea2b6c3643028282c0d37bf2c127cf681..ec8c3dfda8e7535ac419171d0910171bd96abd51 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -2,15 +2,16 @@
   <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>
 <% end %>
 
   <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>
 <% end %>
 

-<table class="messages" width="100%">
-  <tr>
-    <th width="25%"><%= t ".post" %></th>
-    <th width="25%"><%= t ".when" %></th>
-    <th width="50%"><%= t ".comment" %></th>
-  </tr>
+<table class="table table-striped" width="100%">
+  <thead>
+    <tr>
+      <th width="25%"><%= t ".post" %></th>
+      <th width="25%"><%= t ".when" %></th>
+      <th width="50%"><%= t ".comment" %></th>
+    </tr>
+  </thead>

   <% @comments.each do |comment| -%>
   <% @comments.each do |comment| -%>

-  <% cl = cycle("table0", "table1") %>
-  <tr class="<%= cl %>">
+  <tr class="<%= "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%"><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>
     <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 %>"><%= 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>