X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/79d096499cc5f85d36bf40db37b95d3acd45d7b8..d07277efba0c0069705bbefa68f2624a9c6c9ff0:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 5f0e848ac..a0034a5ef 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -11,36 +11,36 @@
-<% if @flash[:notice] %> -
<%= @flash[:notice] %>
+<% if flash[:notice] %> +
<%= flash[:notice] %>
<% end %> - <%= @content_for_layout %> + <%= yield %>
<% if @user %> - Welcome, <%= @user.email %> | - <%= link_to 'Logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> + Welcome, <%= @user.display_name %> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> <% else %> - <%= link_to 'Login', {: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 %>
@@ -81,6 +81,8 @@ + <%= yield :optionals %> +