X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8181cb4bf77548088f959562f24be17f8ec053a3..4f15f5926792f5ba2b0efc39792c75830eb82199:/app/views/diary_entry/list.rhtml diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index e05e90531..7a2ccf74d 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,11 +1,18 @@ -

<%= @title %>

+

<%= 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 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> <% else %> <% if @user %> - <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> <% end %> @@ -13,5 +20,13 @@ <%= render :partial => 'diary_entry', :collection => @entries %> -<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %> -<%= auto_discovery_link_tag(:atom, :action => 'rss') %> +<%= 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 %> + +
+ +<%= rss_link_to :action => 'rss' %> +<%= auto_discovery_link_tag :atom, :action => 'rss' %>