X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/91bcc440212a73a6cc4587a2d95b8bc05a7266f5..f6a5d228163b781cd1138ba82d5c177656d0566b:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 7283ebb32..a15c5270b 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' %> @@ -11,8 +11,8 @@
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> @@ -68,26 +68,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 %> + + <% end %> +
Help & Wiki
News blog
@@ -95,28 +111,17 @@ <%= yield :left_menu %>
-
-
- Come to the second OpenStreetMap Conference, The State of the Map: 12th-13th July 2008, Limerick, Ireland. -
-
- <%= yield :optionals %> - - +
+