X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/91bcc440212a73a6cc4587a2d95b8bc05a7266f5..63c2d9a5292e6b19a02bce9fdf80f93dea8a8347:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 7283ebb32..7aa2db7b9 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -11,8 +11,8 @@
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> @@ -76,12 +76,12 @@
<% 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. @@ -95,12 +95,6 @@ <%= yield :left_menu %>
-
-
- Come to the second OpenStreetMap Conference, The State of the Map: 12th-13th July 2008, Limerick, Ireland. -
-
- <%= yield :optionals %>