Show whether a trace is public or private in the trace list, so that a user can easil...

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

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 7283ebb32c6ad8bfcc0a399d3b0760d61d25c026..4b41e5e9e84106cc438a180cd7a9e87ae2869d37 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -76,12 +76,12 @@
       </div>
       <% end %>
 
-      <% if API_STATUS == :offline %>
+      <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
       <div id="alert">
         The OpenStreetMap database is currently offline while
         essential database maintenance work is carried out.
       </div>
-      <% elsif API_STATUS == :readonly %>
+      <% elsif OSM_STATUS == :api_readonly %>
       <div id="alert">
         The OpenStreetMap database is currently in read-only mode while
         essential database maintenance work is carried out.
@@ -95,12 +95,6 @@
         <%= 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>