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

[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 15be9e96402ce89d098f74c6b9908c5b6db0f4a0..0457cc4a21b7fa4a951e9df8197099c952124d29 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -43,16 +43,8 @@
 <% if @entries.empty? %>
   <h4><%= t ".no_entries" %></h4>
 <% else %>
-  <h4><%= t ".recent_entries" %></h4>
-
-  <%= render @entries %>
-
-  <%= render "shared/pagination",
-             :newer_key => "diary_entries.index.newer_entries",
-             :older_key => "diary_entries.index.older_entries",
-             :newer_id => @newer_entries_id,
-             :older_id => @older_entries_id %>
-<% end %>
+  <%= render :partial => "page" %>
+<% end -%>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>