X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e58e77c81f3e0234111d365ecaaf3476da5da7..f67ffb6ebbf81023f003bc22c44ce829e010d193:/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 873528bd8..e648e46f2 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,14 +1,32 @@ -<% if @this_user %> -

<%= link_to @this_user.display_name, :controller => 'user', :action => 'view', :display_name => @this_user.display_name %>'s diary

+

<%= h(@title) %>

+ +<% if @this_user && @this_user.image %> + <%= image_tag url_for_file_column(@this_user, "image") %> +<% end %> - <% if @user and @this_user.id == @user.id %> - <%= link_to 'new post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> +
+ +<% if @this_user %> + <% if @user == @this_user %> + <%= link_to 'New diary post', :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 %> <% end %> <% end %>

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