Update to iD v2.19.6

[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 63df5f9c6026852712856a9d1b2eb6330e765e46..67036050d635df409cc3c9ea00383ff706a4b245 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -1,24 +1,25 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.has_commented_on', :display_name => @user.display_name) %></h1>
+  <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>

 <% end %>
 
 <% 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%"><%= 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="50%" class="richtext"><%= comment.body.to_html %></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 text-break"><%= comment.body.to_html %></td>

   </tr>
   <% end -%>
 </table>
 
 <div class='secondary-actions clearfix'>
   </tr>
   <% end -%>
 </table>
 
 <div class='secondary-actions clearfix'>

-  <span><%= link_to t('.older_comments'), :page => @comment_pages.current.next if @comment_pages.current.next %>
-  <%= link_to t('.newer_comments'), :page => @comment_pages.current.previous if @comment_pages.current.previous %></span>
+  <span><%= link_to t(".older_comments"), :page => @comment_pages.current.next if @comment_pages.current.next %>
+  <%= link_to t(".newer_comments"), :page => @comment_pages.current.previous if @comment_pages.current.previous %></span>

 </div>
 </div>