X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f..888a0be7902750d9af2e5fb87812f9c8a40cf1b7:/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 e3dac5989..9de2efea5 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,43 +1,43 @@ -
- <% if @this_user %> - <%= user_image @this_user %> - <% end %> +<% if @this_user %> + <%= user_image @this_user %> +<% end %> -

<%= h(@title) %>

+

<%= 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 %> +<% 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' %>

+<% if @entries.empty? %> +

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

+<% else %> +

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

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