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

[rails.git] / app / views / diary_entry / list.html.erb

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 756464aa26ac79116c23219b090b5f2521069da5..d6af432fb01d485adfa7cdc7ec6585fbd8fdb9b0 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -34,19 +34,21 @@
     <%= render :partial => 'diary_list_entry', :collection => @entries %>
   <% end %>
 
     <%= render :partial => 'diary_list_entry', :collection => @entries %>
   <% end %>
 

-  <% if @entries.size < @page_size -%>
-    <%= t('diary_entry.list.older_entries') %>
-  <% else -%>
-    <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %>
-  <% end -%>
-
-  |
-
-  <% if @page > 1 -%>
-    <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %>
-  <% else -%>
-    <%= t('diary_entry.list.newer_entries') %>
-  <% end -%>
+  <div class="pagination">
+    <% if @entries.size < @page_size -%>
+      <%= t('diary_entry.list.older_entries') %>
+    <% else -%>
+      <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %>
+    <% end -%>
+
+    |
+
+    <% if @page > 1 -%>
+      <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %>
+    <% else -%>
+      <%= t('diary_entry.list.newer_entries') %>
+    <% end -%>
+  </div>

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