X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1017c4c39a1a8523262f290ff20f999223a0572b..0272d30b9683fb3a4bb6b63940373b17a5c6cf60:/app/views/diary_entry/list.rhtml

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 37b0365aa..9852313bb 100644
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,14 +1,43 @@
-<% if @this_user %>
-  <h2><%= @this_user.display_name %>'s diary</h2>
+<h2><%= h(@title) %></h2>
+
+<% 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 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 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 %>
+
+
+<% if @entries.empty? %>
+	<p>No diary entries</p>
+
+<% else %>
+	
+	<p>Recent diary entries:</p>
+	<hr />
+	<%= 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 %>
+	
+	<br />
+	
 <% end %>
 
-<h3>Recent diary entries:</h3>
+<%= rss_link_to :action => 'rss' %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>
 
-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
 
-<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %>
-<%= auto_discovery_link_tag(:atom, :action => 'rss') %>
+<br />
+<br />
\ No newline at end of file