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

[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 2ffce6ff6d2817e995cbde2d3dc76d1c0e8bb06a..61ceccdc06635cc07ffd2a0f317cc51a2fe2a8e2 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -18,33 +18,17 @@
     <% @comments.each do |comment| -%>
     <tr>
       <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
-      <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><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="25%" class="<%= "text-muted" unless comment.visible? %>">
+        <%= friendly_date_ago(comment.created_at) %>
+      </td>
       <td width="50%" class="richtext text-break<%= " text-muted" unless comment.visible? %>"><%= comment.body.to_html %></td>
     </tr>
     <% end -%>
   </table>
 
-  <nav>
-    <ul class="pagination">
-      <% if @older_comments -%>
-        <li class="page-item">
-          <%= link_to t(".older_comments"), @params.merge(:before => @comments.last.id), :class => "page-link" %>
-        </li>
-      <% else -%>
-        <li class="page-item disabled">
-          <span class="page-link"><%= t(".older_comments") %></span>
-        </li>
-      <% end -%>
-
-      <% if @newer_comments -%>
-        <li class="page-item">
-          <%= link_to t(".newer_comments"), @params.merge(:after => @comments.first.id), :class => "page-link" %>
-        </li>
-      <% else -%>
-        <li class="page-item disabled">
-          <span class="page-link"><%= t(".newer_comments") %></span>
-        </li>
-      <% end -%>
-    </ul>
-  </nav>
+  <%= render "shared/pagination",
+             :newer_key => "diary_entries.comments.newer_comments",
+             :older_key => "diary_entries.comments.older_comments",
+             :newer_id => @newer_comments_id,
+             :older_id => @older_comments_id %>
 <% end -%>