User null to indicate the the user's home location is not set.

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

index a2b912a977f80ac69c2ab67f01f95fa7bb0fb494..c2e831bf72d7addc1273be83669a9933061266ff 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -4,6 +4,8 @@
      <%= javascript_include_tag 'site.js' %>
      <!--[if lt IE 7]><%= javascript_include_tag 'pngfix.js' %><![endif]--> <!-- thanks, microsoft! -->
      <%= stylesheet_link_tag 'site.css' %>
+    <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Placename Search", :href => "/opensearch/osm.xml" }) %>
+    <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Postcode Search", :href => "/opensearch/osm-postcode.xml" }) %>
      <title>OpenStreetMap<%= ' | '+@title if @title %></title>
    </head>
    <body>
@@ -69,6 +71,13 @@
        </div>
        <% end %>
  
+      <% if API_READONLY %>
+      <div id="alert">
+        The OpenStreetMap database is currently in read-only mode while
+        essential database maintenance work is carried out.
+      </div>
+      <% end %>
+
        <div id="left_menu" class="left_menu">
          <a href="http://wiki.openstreetmap.org">Help &amp; Wiki</a><br />
         <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %><br />
@@ -76,14 +85,6 @@
          <a href="http://wiki.openstreetmap.org/index.php/Merchandise">Shop</a><br />
        </div>
  
-
-      <div id="sotm" class="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>