X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2cea4e0d98f6780d16165c394b18b50bbbe35cd0..f74c984a49695df755ed853bc42f1da0fca363e6:/app/views/layouts/site.html.erb?ds=sidebyside
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 89b33ab05..8239c8c2d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,144 +1,122 @@
-
-
-
-
- <% if @notice || flash[:notice] %>
-
<%= @notice || flash[:notice] %>
- <% end %>
-
- <%= yield %>
-
-
-
-
-
- <%= t 'layouts.project_name.h1' %>
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
- <%= t('layouts.tag_line') %>
-
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
+ <%= t 'layouts.project_name.h1' %>
+ <%= t('layouts.tag_line') %>
-
+ <%= yield :optionals %>
<% unless @user %>
-
+
<% end %>
-
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
+
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+
<% end %>
-
- <% if false %>
-
+
+
+
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
<% end %>
-
-
+ <% if defined?(PIWIK) -%>
+
+ <% end -%>