X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..686ce8f3e592a259d2cfc80699d9db9fd9557e97:/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 00937d89e..9de2efea5 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,21 +1,19 @@
-
<%= h(@title) %>
-
-<% if @this_user && @this_user.image %>
- <%= image_tag url_for_file_column(@this_user, "image") %>
+<% if @this_user %>
+ <%= user_image @this_user %>
<% end %>
+<%= h(@title) %>
<% 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', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+ <%= if_user(@this_user) do %>
+ <%= 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', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+ <%= if_logged_in do %>
+ <%= 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? %>
<%= t 'diary_entry.list.no_entries' %>
<% else %>
@@ -23,17 +21,23 @@
- <%= render :partial => 'diary_entry', :collection => @entries %>
-
- <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+ <% if @this_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 } if @entry_pages.current.previous %>
+ <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
<% end %>
-<%= rss_link_to :action => 'rss' %>
+<% unless params[:friends] or params[:nearby] -%>
+<%= rss_link_to :action => 'rss', :language => params[:language] %>
-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
-<% end %>
+<% content_for :head do -%>
+<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+<% end -%>
+<% end -%>