Swap older/newer diary entries buttons

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 4a8beab37eb4be8a9c383e1435da0c304b9ab96f..e95b31bb2b88e901591a907dca9fe1a63c7fac36 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -38,23 +38,23 @@
 
   <nav>
     <ul class="pagination">
-      <% if @older_entries -%>
+      <% if @newer_entries -%>
         <li class="page-item">
-          <%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :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 @newer_entries -%>
+      <% if @older_entries -%>
         <li class="page-item">
-          <%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :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>

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index ea918cb6bbd765b577d6460901cebba1b9985e71..b505d9cdb8666ed6221b1302512867b0b48e0925 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -568,28 +568,28 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1
 
     # Try and get the second page
-    get css_select("li.page-item a.page-link").first["href"]
+    get css_select("li.page-item .page-link").last["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Try and get the third page
-    get css_select("li.page-item a.page-link").first["href"]
+    get css_select("li.page-item .page-link").last["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 10
     assert_select "li.page-item.disabled span.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Go back to the second page
-    get css_select("li.page-item a.page-link").last["href"]
+    get css_select("li.page-item .page-link").first["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Go back to the first page
-    get css_select("li.page-item a.page-link").last["href"]
+    get css_select("li.page-item .page-link").first["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1