X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d7eb387a7c3573f1a1d17df00adcaa1fb9b9fa5..9c04912f1deb7b114c61e838a6e4a4b7775167d8:/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 3353fef79..2d9a4b167 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,22 +1,26 @@
 <% content_for :heading do %>
-  <div <% if @this_user %> id="userinformation"<% end %> >
-    <% if @this_user %>
-      <%= user_image @this_user %>
+  <div <% if @user %> id="userinformation"<% end %> >
+    <% if @user %>
+      <%= user_image @user %>
     <% end %>
-    <h2><%= h(@title) %></h2>
+    <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>
+      <% if @user %>
+        <% if @user == current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% 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>
+        <% if current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% end %>
       <% end %>
     </ul>
@@ -24,24 +28,35 @@
 <% end %>
 
 <% if @entries.empty? %>
-  <h4><%= t 'diary_entry.list.no_entries' %></h4>
+  <h4><%= t '.no_entries' %></h4>
 <% else %>
-  <h4><%= t 'diary_entry.list.recent_entries' %></h4>
+  <h4><%= t '.recent_entries' %></h4>
 
-<% if @this_user %>
-  <%= render :partial => 'diary_entry', :collection => @entries %>
-<% else %>
-  <%= render :partial => 'diary_list_entry', :collection => @entries %>
-<% end %>
+  <% if @user %>
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= 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 %>
+  <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>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
-  <% content_for :head do -%>
-  <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+  <% content_for :auto_discovery_link_tag do -%>
+  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
   <% end -%>
 <% end -%>