X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e5803ecc11534aa05522de3f472f0f737876fad2..18409c05ab43a2f818f6db911ae383eb0ebfb07d:/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 da9e86808..f02f024a5 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,139 +1,14 @@
-
-
-
- <%= javascript_strings %>
- <%= 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') %>
-
-
-
- <% unless @user %>
-
-
- <%= t 'layouts.intro_1' %>
-
-
- <%= t 'layouts.intro_2' %>
-
-
- <%= t 'layouts.intro_3',
- :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
- :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>
-
-
- <% end %>
-
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
-
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
-
- <% end %>
-
- <% if false %>
-
- <% end %>
-
-
-
- <%= yield :optionals %>
-
-
-
-
-
- <%= link_to(
- image_tag("cc_button.png",
- :alt => t('layouts.license.alt'),
- :border => 0,
- :width => 88,
- :height => 31,
- :title => t('layouts.license.title')),
- "http://creativecommons.org/licenses/by-sa/2.0/",
- { :rel => "license" }) %>
-
-
-
-
-
+
+<%= tag.html :lang => I18n.locale,
+ :dir => dir,
+ :data => { :bs_theme => (preferred_color_scheme(:site) if preferred_color_scheme(:site) != "auto") } do %>
+ <%= render :partial => "layouts/head" %>
+ <%= tag.body :class => body_class,
+ :data => { :map_theme => (preferred_color_scheme(:map) if preferred_color_scheme(:map) != "auto") } do %>
+ <%= render :partial => "layouts/header" %>
+ <%= render :partial => "layouts/content" %>
+ <% if defined?(Settings.matomo) -%>
+