Make sure the diary link in the LHS navigation goes to the global diary.

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 54b7af10c532c8021afaa3f5e682e1431c867716..e39c31b69fd27f2332ac0fd1f24c40563cc6ce90 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -24,7 +24,7 @@
     </div>
 
     <span id="greeting">
-      <% if @user %>
+      <% if @user and @user.id %>
         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | 
         <% @inbox_weight = 'bold' if @user.get_new_messages.length > 0 %>
         <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
@@ -72,7 +72,7 @@
 
       <div id="left_menu">
         <a href="http://wiki.openstreetmap.org">Help & Wiki</a><br />
-               <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list'} %><br />
+       <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %><br />
         <a href="http://www.opengeodata.org/">News blog</a><br />
         <a href="http://wiki.openstreetmap.org/index.php/Merchandise">Shop</a><br />
 </div>