X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f..456d41e1897144d092f2d9a5597a6e00167bb99c:/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 e3dac5989..3353fef79 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,43 +1,47 @@ -
- <% 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 %> - <% end %> - - <% if @entries.empty? %> -

<%= t 'diary_entry.list.no_entries' %>

- <% else %> -

<%= t 'diary_entry.list.recent_entries' %>

- -
- +<% content_for :heading do %> +
id="userinformation"<% end %> > <% if @this_user %> - <%= render :partial => 'diary_entry', :collection => @entries %> - <% else %> - <%= render :partial => 'diary_list_entry', :collection => @entries %> + <%= user_image @this_user %> <% end %> +

<%= h(@title) %>

+ + +
+<% 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.empty? %> +

<%= t 'diary_entry.list.no_entries' %>

+<% else %> +

<%= t 'diary_entry.list.recent_entries' %>

-
- <% end %> +<% if @this_user %> + <%= render :partial => 'diary_entry', :collection => @entries %> +<% else %> + <%= render :partial => 'diary_list_entry', :collection => @entries %> +<% end %> - <%= rss_link_to :action => 'rss', :language => params[:language] %> -
+<%= 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 %> -<% content_for :head do %> -<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> <% end %> + +<% unless params[:friends] or params[:nearby] -%> + <% content_for :head do -%> + <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> + <% end -%> +<% end -%>