X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/691aab02fcd76cde87e0f55ddf61b3a288ab5a36..db66d47e42bc267670ef00b3b2611b4b53cb40e9:/app/views/diary_entry/list.rhtml?ds=sidebyside diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index 31c370c6d..e648e46f2 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,4 +1,11 @@ -

<%= @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 %> @@ -13,11 +20,13 @@ <%= render :partial => 'diary_entry', :collection => @entries %> -<%= link_to "Older Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %> +<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %> +<% if @entry_pages.current.next and @entry_pages.current.previous %> | -<%= link_to "Newer Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %> +<% 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' %>