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

[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 1940e798b8d55155d8c337fef84b80b87cc37146..17ddba62e6ffa335f771a71d4f57d4aee2f045f8 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -5,7 +5,7 @@
     <% end %>
     <h1><%= @title %></h1>
 
     <% end %>
     <h1><%= @title %></h1>
 

-    <ul class='secondary-actions clearfix'>
+    <ul class="secondary-actions clearfix">

       <% unless params[:friends] or params[:nearby] -%>
         <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>
       <% unless params[:friends] or params[:nearby] -%>
         <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>


@@ -13,6 +13,10 @@
       <% 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>
       <% 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>
       <% end %>

+
+      <% if !@user && current_user %>
+        <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
+      <% end %>

     </ul>
   </div>
 <% end %>
     </ul>
   </div>
 <% end %>


@@ -24,21 +28,29 @@
 
   <%= render @entries %>
 
 
   <%= render @entries %>
 

-  <div class="pagination">
-    <% if @entries.size < @page_size -%>
-      <%= t(".older_entries") %>
-    <% else -%>
-      <%= link_to t(".older_entries"), @params.merge(:page => @page + 1) %>
-    <% end -%>
-
-    |
+  <nav>
+    <ul class="pagination">
+      <% if @entries.size >= @page_size -%>
+        <li class="page-item">
+          <%= link_to t(".older_entries"), @params.merge(:page => @page + 1), :class => "page-link" %>
+        </li>
+      <% else -%>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".older_entries") %></span>
+        </li>
+      <% end -%>

 
 

-    <% if @page > 1 -%>
-      <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1) %>
-    <% else -%>
-      <%= t(".newer_entries") %>
-    <% end -%>
-  </div>
+      <% if @page > 1 -%>
+        <li class="page-item">
+          <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1), :class => "page-link" %>
+        </li>
+      <% else -%>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".newer_entries") %></span>
+        </li>
+      <% end -%>
+    </ul>
+  </nav>

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