Make pagination partial view

diff --git a/app/views/diary_entries/_pagination.html.erb b/app/views/diary_entries/_pagination.html.erb
new file mode 100644 (file)
index 0000000..63a0fc3
--- /dev/null
+++ b/app/views/diary_entries/_pagination.html.erb
@@ -0,0 +1,23 @@
+<nav>
+  <ul class="pagination">
+    <% if instance_variable_get("@newer_#{name}") -%>
+      <li class="page-item">
+        <%= link_to t("newer_#{name}", :scope => scope), @params.merge(:after => instance_variable_get("@#{name}").first.id), :class => "page-link" %>
+      </li>
+    <% else -%>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t("newer_#{name}", :scope => scope) %></span>
+      </li>
+    <% end -%>
+    
+    <% if instance_variable_get("@older_#{name}") -%>
+      <li class="page-item">
+        <%= link_to t("older_#{name}", :scope => scope), @params.merge(:before => instance_variable_get("@#{name}").last.id), :class => "page-link" %>
+      </li>
+    <% else -%>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t("older_#{name}", :scope => scope) %></span>
+      </li>
+    <% end -%>
+  </ul>
+</nav>

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 2ffce6ff6d2817e995cbde2d3dc76d1c0e8bb06a..56c0e76c5fd97ece4b7c22f25cd9bc945562c6b4 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -24,27 +24,5 @@
     <% end -%>
   </table>
 
     <% 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 "pagination", :name => "comments", :scope => "diary_entries.comments" %>

 <% end -%>
 <% end -%>

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index e95b31bb2b88e901591a907dca9fe1a63c7fac36..e4cc8fc8e6ffd7768e51c260ef33a19ba3883a6f 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -36,29 +36,7 @@
 
   <%= render @entries %>
 
 
   <%= render @entries %>
 

-  <nav>
-    <ul class="pagination">
-      <% if @newer_entries -%>
-        <li class="page-item">
-          <%= 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(".newer_entries") %></span>
-        </li>
-      <% end -%>
-
-      <% if @older_entries -%>
-        <li class="page-item">
-          <%= 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(".older_entries") %></span>
-        </li>
-      <% end -%>
-    </ul>
-  </nav>
+  <%= render "pagination", :name => "entries", :scope => "diary_entries.index" %>

 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>