X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..abc83298cdc9f63a1956ee5a7d30f75b7c7dec07:/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 ba42ae23c..28cb69b24 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,27 +1,21 @@
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %> >
+  <div <% if @user %> id="userinformation"<% end %>>
     <% if @user %>
       <%= user_image @user %>
     <% end %>
-    <h1><%= h(@title) %></h1>
+    <h1><%= @title %></h1>
 
     <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 %>
-          <div>
-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>
-          </div>
-        <% end %>
-      <% else %>
-        <% if current_user %>
-          <div>
-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>
-          </div>
-        <% 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>
@@ -32,27 +26,31 @@
 <% else %>
   <h4><%= t ".recent_entries" %></h4>
 
-  <% if @user %>
-    <%= render :partial => "diary_entry", :collection => @entries %>
-  <% else %>
-    <%= render :partial => "diary_index_entry", :collection => @entries %>
-  <% end %>
-
-  <div class="pagination">
-    <% if @entries.size < @page_size -%>
-      <%= t(".older_entries") %>
-    <% else -%>
-      <%= link_to t(".older_entries"), @params.merge(:page => @page + 1) %>
-    <% end -%>
-
-    |
-
-    <% if @page > 1 -%>
-      <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1) %>
-    <% else -%>
-      <%= t(".newer_entries") %>
-    <% end -%>
-  </div>
+  <%= render @entries %>
+
+  <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'>
+          <%= link_to t('.older_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
+        </li>
+      <% end -%>
+
+      <% 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'>
+          <%= link_to t('.newer_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
+        </li>
+      <% end -%>
+    </ul>
+  </nav>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>