Make data browser work with OpenLayers 2.7.

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

index 52e7b6b242847869e54c8feb7f2f1ab9530c74bb..7aa2db7b9432cdb5d44a90e7e38d6fa9e0866e33 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -11,8 +11,8 @@
    </head>
    <body>
      <div id="content">
    </head>
    <body>
      <div id="content">
-      <% if flash[:notice] %>
-        <div id="notice"><%= flash[:notice] %></div>
+      <% if @notice || flash[:notice] %>
+        <div id="notice"><%= @notice || flash[:notice] %></div>
        <% end %>
  
        <%= yield %>
        <% end %>
  
        <%= yield %>
@@ -95,12 +95,6 @@
          <%= yield :left_menu %>
        </div>
  
          <%= yield :left_menu %>
        </div>
  
-      <div id="sotm" class="left_menu">
-        <div id="sotminfo">
-        Come to the second OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 12th-13th July 2008, Limerick, Ireland.
-        </div>
-      </div>
-
        <%= yield :optionals %>
        <div id="cclogo">
          <center>
        <%= yield :optionals %>
        <div id="cclogo">
          <center>