X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4f826acfca0ede6b7d4868e8bb45a608c44582ce..1bbe59b6a77030c362f9991083aa7c06799b272d:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 1154237cb..8d2ac722e 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,3 +1,4 @@ + <%= javascript_include_tag 'main.js' %> @@ -15,7 +16,7 @@ <% end %>
<% if flash[:notice] %> -
<%= flash[:notice] %>
+
<%= flash[:notice] %>
<% end %> <%= yield %> @@ -24,11 +25,11 @@ <% 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 %> @@ -68,6 +69,7 @@
Help & Wiki
+ <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list'} %>
News blog
Shop