TomH's way history patch

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 8d2ac722ecfec3618df7f7ef1319a7622c1ead26..c9a70b79e83d020bbc9b42185f2533ca19992187 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -26,9 +26,9 @@
     <span id="greeting">
       <% 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 %>
     </span>
@@ -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'
         %>
         <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass  } %></li>
@@ -72,7 +73,16 @@
                <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list'} %><br />
         <a href="http://www.opengeodata.org/">News blog</a><br />
         <a href="http://wiki.openstreetmap.org/index.php/Merchandise">Shop</a><br />
+</div>
+
+
+      <div id="left_menu">
+    <div id="sotminfo">
+Come to the first OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 14th-15th July 2007, Manchester, UK.
+</div>
       </div>
+
+
       <%= yield :optionals %>
       <div id="cclogo">
         <center>