X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c382f33e1c2e17ba00898dede1ff9c3605818f16..0f727ece17c09c975526d61b04c7ff13965b90e0:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index d32490729..9290ea892 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,3 +1,4 @@
+
<%= javascript_include_tag 'main.js' %>
@@ -6,7 +7,7 @@
<%= javascript_include_tag 'site.js' %>
- OpenStreetMap
+ OpenStreetMap<%= ' | '+@title if @title %>
@@ -23,12 +24,11 @@
- <% if @user %>
- Welcome, <%= @user.display_name %> |
- <%= link_to 'account', {:controller => 'user', :action => 'account'}, {:id => 'loginanchor'}%> |
- <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
+ <% 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'}%>
<% 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 } %>
@@ -53,7 +54,7 @@
OpenStreetMap
- 
+ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
The Free Wiki World Map
@@ -69,9 +70,19 @@
+
+
+
+
+
<%= yield :optionals %>