X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1017c4c39a1a8523262f290ff20f999223a0572b..b387800234e8e1d019ba7488af3ae169c5ba5525:/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 37b0365aa..e05e90531 100644
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,14 +1,17 @@
+<h2><%= @title %></h2>
 <% if @this_user %>
-  <h2><%= @this_user.display_name %>'s diary</h2>
-
-  <% if @user and @this_user.id == @user.id %>
-    <%= link_to 'new post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+  <% 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 %>
 
 <h3>Recent diary entries:</h3>
 
-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
+<%= render :partial => 'diary_entry', :collection => @entries %>
 
 <%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %>
 <%= auto_discovery_link_tag(:atom, :action => 'rss') %>