X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7a4dadbd5e9b0644e44800324dc81d1ec56201e..5777c5e925acf5317f221073368ab8d81b10fd05:/app/views/layouts/site.html.erb?ds=inline
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 976117e08..d04a2877f 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,32 +1,9 @@
-
-
- <% if flash[:error] %>
-
<%= flash[:error] %>
- <% end %>
- <% if flash[:warning] %>
-
<%= flash[:warning] %>
- <% end %>
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
- <% end %>
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %>
@@ -60,18 +37,30 @@
diaryclass = 'active' if params['controller'] == 'diary_entry'
%>
@@ -99,23 +88,16 @@
<% end %>
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
<%= t 'layouts.osm_offline' %>
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
<%= t 'layouts.osm_read_only' %>
<% end %>
-
- OpenStreetMap will be undergoing database maintenance from 1st to 3rd
- July. See
- the
wiki
- for details.
-
-
<% if false %>
<%= t 'layouts.donate', :link => "
#{t('layouts.donate_link_text')}" %>
@@ -123,15 +105,18 @@
<% end %>
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2010'), :title => t('layouts.sotm2010'), :border => "0"), "http://www.stateofthemap.org/register/" %>
+
+ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
<%= yield :optionals %>