X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/91bcc440212a73a6cc4587a2d95b8bc05a7266f5..231bdf66cdc8239c37e1536be4fb52ce275219e3:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 7283ebb32..cc8f7192d 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,5 +1,5 @@
-
+
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag 'site' %>
@@ -7,12 +7,14 @@
<%= stylesheet_link_tag 'site' %>
<%= stylesheet_link_tag 'print', :media => "print" %>
<%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
+ <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+ <%= yield :head %>
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+
<%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
@@ -68,26 +70,42 @@
<% unless @user %>
- OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-
- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-
- OpenStreetMap's hosting is kindly supported by the
UCL VR Centre and
bytemark.
+
+ OpenStreetMap is a free editable map of the whole world. It
+ is made by people like you.
+
+
+ OpenStreetMap allows you to view, edit and use geographical
+ data in a collaborative way from anywhere on Earth.
+
+
+ OpenStreetMap's hosting is kindly supported by the
+ UCL VR Centre and
+ bytemark.
+
<% end %>
- <% if API_STATUS == :offline %>
+ <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
The OpenStreetMap database is currently offline while
essential database maintenance work is carried out.
- <% elsif API_STATUS == :readonly %>
+ <% elsif OSM_STATUS == :api_readonly %>
The OpenStreetMap database is currently in read-only mode while
essential database maintenance work is carried out.
<% end %>
+ <% if false %>
+
+ Support OpenStreetMap by
+
donating
+ to the Hardware Upgrade Fund.
+
+ <% end %>
+
-
-
<%= yield :optionals %>
-
-
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+
+