X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a42dc9f4826da27b21fa1f66ea6318110afaa0b2..0f727ece17c09c975526d61b04c7ff13965b90e0:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 0ff110ced..9290ea892 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,3 +1,4 @@
+
<%= javascript_include_tag 'main.js' %>
@@ -6,84 +7,98 @@
<%= javascript_include_tag 'site.js' %>
-<% if @flash[:notice] %>
-
<%= @flash[:notice] %>
-<% end %>
-
- <%= @content_for_layout %>
-
-
-
-
-
-
-
- OpenStreetMap
-
-
- The Free Wiki World Map
-
-
+ <% if flash[:notice] %>
+
<%= flash[:notice] %>
+ <% end %>
+
+ <%= yield %>
-
- OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-
- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-
- OpenStreetMap's hosting is kindly supported by the
UCL VR Centre and
bytemark.
+
+
+ <% 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', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> |
+ <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+ <% end %>
+
+
+
+
+ <% viewclass = ''
+ editclass = ''
+ 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 } %>
+ - <%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass } %>
+ - <%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>
+
-