X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92ca4069957666065194e0b63de5b46261b8a21d..36a41a8cc5259a8f1aa6c3708cf0d27fabfa8622:/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 32a4e1e0f..40c3e585e 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -5,19 +5,17 @@
     <% 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 -%>
 
-      <% if @user %>
-        <% if @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 %>
-      <% else %>
-        <% if 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>
@@ -30,21 +28,29 @@
 
   <%= 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_if @page > 1, 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] -%>