X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c81c31775bd3d0260fe1c8205faafc80d7783c8c..97cb1fd7fa2916974538fde2a6ea311a3f793989:/app/views/diary_entry/list.rhtml?ds=inline diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index a7aa84c6f..e648e46f2 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,10 +1,16 @@ +

<%= h(@title) %>

+ +<% if @this_user && @this_user.image %> + <%= image_tag url_for_file_column(@this_user, "image") %> +<% end %> + +
+ <% if @this_user %> -

<%= @this_user.display_name %>'s diary

<% if @user == @this_user %> <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> <% else %> -

Users' diaries

<% if @user %> <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> @@ -12,7 +18,15 @@

Recent diary entries:

-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %> +<%= render :partial => 'diary_entry', :collection => @entries %> + +<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %> +<% if @entry_pages.current.next and @entry_pages.current.previous %> +| +<% end %> +<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %> + +
-<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %> -<%= auto_discovery_link_tag(:atom, :action => 'rss') %> +<%= rss_link_to :action => 'rss' %> +<%= auto_discovery_link_tag :atom, :action => 'rss' %>