X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4f826acfca0ede6b7d4868e8bb45a608c44582ce..8758685a86c3032a412183a53399e3e77dae75a1:/app/views/layouts/site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 1154237cb..c2e4c9bfc 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -15,7 +15,7 @@
     <% end %>
     <div id="content">
       <% if flash[:notice] %>
-      <div id="notice"><%= flash[:notice] %></div>
+        <div id="notice"><%= flash[:notice] %></div>
       <% end %>
 
       <%= yield %>
@@ -24,11 +24,11 @@
 
     <span id="greeting">
       <% if @user %>
-      Welcome, <%= @user.display_name %> |
-      <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {: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'}%> |
-      <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+        <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
+        <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
       <% end %>
     </span>
 
@@ -68,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>