X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/83beee6d6a49c7403ac21e0603b923905f56d527..1c4c93b2c3e57f6fdd5d6fe9f64c389afee39a2f:/app/views/layouts/site.rhtml?ds=inline diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 8d2ac722e..ebdcf8d19 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -26,9 +26,9 @@ <% 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'}, {:id => 'loginanchor'}%> + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> <% else %> - <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> | + <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> | <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> <% end %> @@ -40,6 +40,7 @@ traceclass = '' viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' + editcalss = 'active' if params['controller'] == 'campaign' traceclass = 'active' if params['controller'] == 'trace' %>