X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/198281ffa9c26d7c18ef0bcf293f2c22dd37fcd2..d478f94239ece371d6b14ce5e51adfbf7393073f:/app/views/diary_entry/list.html.erb?ds=sidebyside

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 9fbb9ca32..0f3415fb6 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,26 +1,32 @@
-<% if @this_user %>
-<%= user_image @this_user, :style => "float: right" %>
+<% content_for :heading do %>
+  <div <% if @this_user %> id="userinformation"<% end %> >
+    <% if @this_user %>
+      <%= user_image @this_user %>
+    <% 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 -%>
+
+      <% if @this_user %>
+        <%= if_user(@this_user) do %>
+          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+        <% end %>
+      <% else %>
+        <%= if_logged_in do %>
+          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
 <% end %>
 
-<h2><%= h(@title) %></h2>
-
-<% if @this_user %>
-  <% if @user == @this_user %>
-    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
-  <% end %>
-<% else %>
-  <% if @user %>
-    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
-  <% end %>
-<% end %>
-
-
 <% if @entries.empty? %>
-  <p><%= t 'diary_entry.list.no_entries' %></p>
+  <h4><%= t 'diary_entry.list.no_entries' %></h4>
 <% else %>
-  <p><%= t 'diary_entry.list.recent_entries' %></p>
-
-  <hr />
+  <h4><%= t 'diary_entry.list.recent_entries' %></h4>
 
   <% if @this_user %>
     <%= render :partial => 'diary_entry', :collection => @entries %>
@@ -28,15 +34,23 @@
     <%= render :partial => 'diary_list_entry', :collection => @entries %>
   <% end %>
 
-  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
-  <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
-  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
+  <% if @entries.size < @page_size -%>
+    <%= t('diary_entry.list.older_entries') %>
+  <% else -%>
+    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page + 1 ) %>
+  <% end -%>
 
-  <br />
-<% end %>
+  |
 
-<%= rss_link_to :action => 'rss', :language => params[:language] %>
-
-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+  <% if @page > 1 -%>
+    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page - 1) %>
+  <% else -%>
+    <%= t('diary_entry.list.newer_entries') %>
+  <% end -%>
 <% end %>
+
+<% unless params[:friends] or params[:nearby] -%>
+  <% content_for :auto_discovery_link_tag do -%>
+  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
+  <% end -%>
+<% end -%>