X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1c4c93b2c3e57f6fdd5d6fe9f64c389afee39a2f..874c4f367f3be1d2b6b14f1df3386fc42e8c40ef:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index ebdcf8d19..df6989bf8 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -2,12 +2,12 @@ <%= javascript_include_tag 'main.js' %> - + <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - OpenStreetMap + OpenStreetMap<%= ' | '+@title if @title %> @@ -25,10 +25,10 @@ <% if @user %> - Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}, {:id => 'loginanchor'}%> | - <%= link_to 'logout', {:controller => 'user', :action => 'logout', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> + Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> <% else %> - <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> | + <%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> <% end %> @@ -54,7 +54,7 @@ @@ -78,7 +78,7 @@
-Come the the first OpenStreetMap Conference - The State of the Map 14th-15th July, 2007, Manchester, UK. +Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK.