announcement for SOTM to site on front page

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index f42048b882c3269c8f432b6a2c6809d167f4f882..ebdcf8d19cb6e2261e83396bd97c54829ac1cc85 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -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 the 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>

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 4dbc06f54b2a5dca59946a80e3951860e76f5c0c..5f672216e14fe121d28b160d26a985035339a67a 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -477,4 +477,49 @@ input {
 #map p#highlightinfo p, #popup p {\r
     margin : 0;\r
     padding : 2px;\r
+  }\r
+\r
+\r
+/**State of the Map */\r
+    \r
+#sotminfo {\r
+  background: #9999FF;\r
+  font-size: 11px;\r
+  margin: 0px;\r
+  padding: 0px;\r
+  border: 1px solid #ccc;\r
+  left: 0px;\r
+  line-height: 1.2em;\r
+  text-align: Left;\r
+  font-weight: normal;\r
+}\r
+#left_menu a {\r
+  color: #000000;\r
+  text-decoration: none;\r
+}\r
+\r
+#messages {\r
+  border: 1px solid #ccc;\r
+}\r
+\r
+#left_menu a:visited {\r
+  color: #000000;\r
+  text-decoration: underline;\r
+}\r
+\r
+#left_menu a:active {\r
+  color: #000000;\r
+  text-decoration: underline;\r
 }\r
+\r
+#left_menu a:link {\r
+  color: #000000;\r
+  text-decoration: underline;\r
+}\r
+\r
+#left_menu a:hover {\r
+  color: #000000;\r
+  text-decoration: underline;\r
+}\r
+\r
+\r