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

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

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 0dfe95fa388ca3fa128b873eb70d061161167f9e..e95b31bb2b88e901591a907dca9fe1a63c7fac36 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,9 +1,9 @@
-<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %> class="row">
+  <div class="row">
     <% if @user %>
         <div class="col-auto">
-          <%= user_image @user, :class => "user_image_no_margins" %>
+          <%= user_image @user %>
         </div>
     <% end %>
 
@@ -38,23 +38,23 @@
 
   <nav>
     <ul class="pagination">
-      <% if @entries.size >= @page_size -%>
+      <% if @newer_entries -%>
         <li class="page-item">
-          <%= link_to t(".older_entries"), @params.merge(:page => @page + 1), :class => "page-link" %>
+          <%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :class => "page-link" %>
         </li>
       <% else -%>
         <li class="page-item disabled">
-          <span class="page-link"><%= t(".older_entries") %></span>
+          <span class="page-link"><%= t(".newer_entries") %></span>
         </li>
       <% end -%>
 
-      <% if @page > 1 -%>
+      <% if @older_entries -%>
         <li class="page-item">
-          <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1), :class => "page-link" %>
+          <%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :class => "page-link" %>
         </li>
       <% else -%>
         <li class="page-item disabled">
-          <span class="page-link"><%= t(".newer_entries") %></span>
+          <span class="page-link"><%= t(".older_entries") %></span>
         </li>
       <% end -%>
     </ul>