X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3aabf07e1038abf8cf471e463e00309df77df603..1c4c93b2c3e57f6fdd5d6fe9f64c389afee39a2f:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index c7670e795..ebdcf8d19 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,3 +1,4 @@
+
<%= javascript_include_tag 'main.js' %>
@@ -24,11 +25,10 @@
<% if @user %>
- Welcome, <%= @user.display_name %> |
- <%= link_to 'account', {:controller => 'user', :action => 'account'}, {:id => 'loginanchor'}%> |
- <%= 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', :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'
%>
<%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass } %>
@@ -69,9 +70,19 @@
+
+
+
+
+
<%= yield :optionals %>