X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32907b1c37244c6b1a1ce76a74edadf8817422ed..7d3a5899c9ef20b9a67eda05c1b1c167b6677bdd:/app/views/diary_entry/list.rhtml diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index 4fd5e7bc2..38157b183 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,32 +1,39 @@ -

<%= @title %>

+

<%= h(@title) %>

-<% if @user.image %> - <%= image_tag url_for_file_column(@user, "image") %> +<% 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 image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %> <% end %> <% else %> <% if @user %> - <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %> <% end %> <% end %> -

Recent diary entries:

-<%= render :partial => 'diary_entry', :collection => @entries %> +<% if @entries.empty? %> +

No diary entries

+<% else %> +

Recent diary 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 %> -| + <%= 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 %> + +
<% end %> -<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %> -
+<%= rss_link_to :action => 'rss' %> -<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %> -<%= auto_discovery_link_tag(:atom, :action => 'rss') %> +<% content_for :head do %> +<%= auto_discovery_link_tag :atom, :action => 'rss' %> +<% end %>