started work on /diary

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

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index c7670e79581797c884f4f2621811ccd8dcdd9b50..c2e4c9bfc3e4a5e4121d6474270c3d11f21c7e96 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -24,8 +24,7 @@
 
     <span id="greeting">
       <% if @user %>
-        Welcome, <%= @user.display_name %> |
-        <%= link_to 'account', {:controller => 'user', :action => 'account'}, {:id => 'loginanchor'}%> |
+        Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}, {:id => 'loginanchor'}%> |
         <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
       <% else %>
         <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
@@ -69,6 +68,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 />
         <a href="http://www.opengeodata.org/">News blog</a><br />
         <a href="http://wiki.openstreetmap.org/index.php/Merchandise">Shop</a><br />
       </div>