Allow the page titles to be edited by other parts of the app.

[rails.git] / app / views / layouts / site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml

index f42048b882c3269c8f432b6a2c6809d167f4f882..fb0bc57eb140d3668565bad6f93fa2c5ebf3f14d 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -7,7 +7,7 @@
      <%= javascript_include_tag 'site.js' %>
  
      <link rel="stylesheet" type="text/css" href="/stylesheets/site.css" />
-    <title>OpenStreetMap</title>
+    <title>OpenStreetMap<%= ' | '+@title if @title %></title>
    </head>
    <body>
  
@@ -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>