X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70a6ecee190835d24209deed270bbf6a7dd8a588..721dd9c27d299455b9159457a095716f797389f1:/app/views/diary_entry/list.rhtml diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index 0ac45f9d2..9852313bb 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -1,25 +1,43 @@ -

<%= @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 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

-<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %> -<% if @entry_pages.current.next and @entry_pages.current.previous %> -| +<% else %> + +

Recent diary 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 %> + +
+ <% 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' %> -<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %> -<%= auto_discovery_link_tag(:atom, :action => 'rss') %> + +
+
\ No newline at end of file