X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26777c44648f908b723c0c74b65972f75ac5fd3d..f138055849e5b09cd94797c3e1705c6357d6b93b:/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 63a805b3c..e95b31bb2 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,62 +1,68 @@
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %> >
+  <div class="row">
     <% if @user %>
-      <%= user_image @user %>
+        <div class="col-auto">
+          <%= user_image @user %>
+        </div>
     <% end %>
-    <h1><%= h(@title) %></h1>
 
-    <ul class='secondary-actions clearfix'>
-      <% unless params[:friends] or params[:nearby] -%>
-        <li><%= rss_link_to :action => 'rss', :language => params[:language] %></li>
-      <% end -%>
+    <div class="col">
+      <h1><%= @title %></h1>
 
-      <% 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 %>
-      <% end %>
-    </ul>
+      <nav class="secondary-actions">
+        <ul class="clearfix">
+          <% unless params[:friends] or params[:nearby] -%>
+            <li><%= rss_link_to :action => "rss", :language => params[:language] %></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>
+      </nav>
+    </div>
   </div>
 <% end %>
 
 <% if @entries.empty? %>
-  <h4><%= t '.no_entries' %></h4>
+  <h4><%= t ".no_entries" %></h4>
 <% 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>
+  <h4><%= t ".recent_entries" %></h4>
+
+  <%= render @entries %>
+
+  <nav>
+    <ul class="pagination">
+      <% if @newer_entries -%>
+        <li class="page-item">
+          <%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :class => "page-link" %>
+        </li>
+      <% else -%>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".newer_entries") %></span>
+        </li>
+      <% end -%>
+
+      <% if @older_entries -%>
+        <li class="page-item">
+          <%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :class => "page-link" %>
+        </li>
+      <% else -%>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".older_entries") %></span>
+        </li>
+      <% end -%>
+    </ul>
+  </nav>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>
-  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
+  <%= auto_discovery_link_tag :rss, :action => "rss", :language => params[:language] %>
   <% end -%>
 <% end -%>