Merge 14059:14394 from trunk.

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

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 49c0ae3769f4bd0ca7b3f7e625a30931baf3aeeb..bc51fa98b3a576eaee6ec6d89ead45607f271da7 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -102,7 +102,7 @@
       <% end %>
 
       <% if false %>
-      <div id="donate">
+      <div id="donate" class="notice">
         Support OpenStreetMap by
         <a href="http://donate.openstreetmap.org/">donating</a>
         to the Hardware Upgrade Fund.
@@ -116,6 +116,12 @@
         <%= yield :left_menu %>
       </div>
 
+      <div id="sotm" class="notice">
+        Come to the 2009 OpenStreetMap
+        Conference, <a href="http://www.stateofthemap.org">The State
+        of the Map</a>, July 10-12 in Amsterdam!
+      </div>
+
       <%= yield :optionals %>
 
       <center>