X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8cd02f413690abfb499e02a5824bd46c1504b86f..d414ffc61a0f6505f1d06e89e8668fa5b49d607e:/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 0bc17d2bb..2939ec7e6 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,39 +1,56 @@ -

<%= h(@title) %>

- -<% if @this_user && @this_user.image %> - <%= image_tag url_for_file_column(@this_user, "image") %> -<% end %> - - -<% 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'}, {: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'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> +<% content_for :heading do %> +
id="userinformation"<% end %> > + <% if @this_user %> + <%= user_image @this_user %> + <% end %> +

<%= h(@title) %>

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

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

+

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

<% else %> -

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

- -
+

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

- <%= render :partial => 'diary_entry', :collection => @entries %> - - <%= 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 @this_user %> + <%= render :partial => 'diary_entry', :collection => @entries %> + <% else %> + <%= render :partial => 'diary_list_entry', :collection => @entries %> + <% end %> -
-<% end %> + <% if @entries.size < @page_size -%> + <%= t('diary_entry.list.older_entries') %> + <% else -%> + <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page + 1 ) %> + <% end -%> -<%= rss_link_to :action => 'rss', :language => params[:language] %> + | -<% content_for :head do %> -<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> + <% if @page > 1 -%> + <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page - 1) %> + <% else -%> + <%= t('diary_entry.list.newer_entries') %> + <% end -%> <% end %> + +<% unless params[:friends] or params[:nearby] -%> + <% content_for :head do -%> + <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> + <% end -%> +<% end -%>