X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..f74c984a49695df755ed853bc42f1da0fca363e6:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 37d2b1962..8239c8c2d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,133 +1,122 @@
-
-
-
- <%= javascript_include_tag 'prototype' %>
- <%= javascript_include_tag 'site' %>
-
- <%= 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 @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.offline' %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
+
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-
- <%= t 'layouts.read_only' %>
- <% end %>
-
- <% if false %>
-
- <%= t 'layouts.donate', :link => "
#{t('layouts.donate_link_text')}" %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+
<% end %>
-
-
+
+
+
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
-
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %>
+ <% end %>
+
+ <%= yield %>
-
- <%= 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/" %>
-
-
+ <% if defined?(PIWIK) -%>
+
+ <% end -%>