X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07ebb40ebb9ba3cefe37c7d1dc10d748145b8034..05514ced0c121c1e936bec0e301faa4a04cc3a30:/app/views/diary_entry/list.html.erb
diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 9de2efea5..2d9a4b167 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,43 +1,62 @@
-<% if @this_user %>
- <%= user_image @this_user %>
-<% end %>
-
-
<%= h(@title) %>
-
-<% if @this_user %>
- <%= 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_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 %>
+<% content_for :heading do %>
+ id="userinformation"<% end %> >
+ <% if @user %>
+ <%= user_image @user %>
+ <% end %>
+
<%= h(@title) %>
+
+
+ <% unless params[:friends] or params[:nearby] -%>
+ - <%= rss_link_to :action => 'rss', :language => params[:language] %>
+ <% end -%>
+
+ <% if @user %>
+ <% if @user == current_user %>
+
+
- <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %>
+
+ <% end %>
+ <% else %>
+ <% if current_user %>
+
+
- <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %>
+
+ <% end %>
+ <% end %>
+
+
<% end %>
<% if @entries.empty? %>
- <%= t 'diary_entry.list.no_entries' %>
+ <%= t '.no_entries' %>
<% else %>
- <%= t 'diary_entry.list.recent_entries' %>
-
-
+ <%= t '.recent_entries' %>
- <% if @this_user %>
+ <% 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 %>
-
-
+
<% end %>
<% 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', :language => params[:language] %>
-<% end -%>
+ <% content_for :auto_discovery_link_tag do -%>
+ <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
+ <% end -%>
<% end -%>