Merge pull request #5034 from grischard/patch-4

[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 78ac0dcf869976bf05d4a020172e1e2c0202b90e..0457cc4a21b7fa4a951e9df8197099c952124d29 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -25,7 +25,14 @@
           <% end %>
 
           <% if @user && @user == current_user || !@user && current_user %>
           <% end %>
 
           <% if @user && @user == current_user || !@user && current_user %>

-            <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+            <li>
+              <%= link_to new_diary_entry_path, :class => "icon-link", :title => t(".new_title") do %>
+                <svg width="16" height="16">
+                  <path d="M2 0 a2 2 0 0 0 -2 2 v12 a2 2 0 0 0 2 2 h12 a2 2 0 0 0 2 -2 v-12 a2 2 0 0 0 -2 -2 z M4 7 h3 v-3 h2 v3 h3 v2 h-3 v3 h-2 v-3 h-3 z" fill="currentColor" />
+                </svg>
+                <%= t(".new") %>
+              <% end %>
+            </li>

           <% end %>
         </ul>
       </nav>
           <% end %>
         </ul>
       </nav>


@@ -36,16 +43,8 @@
 <% if @entries.empty? %>
   <h4><%= t ".no_entries" %></h4>
 <% else %>
 <% 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 -%>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>