X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9fa49c99485b0ba1242c6d13e12df9ab1532987..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/app/views/layouts/_head.html.erb?ds=sidebyside
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 5dfc49aa0..3300dc89c 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,22 +1,18 @@
-
-
- <%= javascript_strings %>
- <%= javascript_include_tag 'prototype' %>
- <%= javascript_include_tag 'rails' %>
- <%= javascript_include_tag 'site' %>
- <%= javascript_include_tag 'menu' %>
-
- <%= stylesheet_link_tag 'common' %>
- <%= stylesheet_link_tag t('html.dir') %>
-
- <%= stylesheet_link_tag 'small', :media => "only screen and (max-width:641px)" %>
- <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 642px)" %>
- <%= stylesheet_link_tag 'print', :media => "print" %>
- <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
- <%= 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." }) %>
- <%= style_rules %>
+<%= content_tag :head, :data => application_data do %>
+
+
+ <%= javascript_include_tag "html5shiv" unless browser.html5? %>
+ <%= javascript_include_tag "es5" unless browser.es5? %>
+ <%= javascript_include_tag "es6" unless browser.es6? %>
+ <%= javascript_include_tag "application" %>
+ <%= javascript_include_tag "i18n/" + I18n.locale.to_s %>
+ <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
+ <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
+ <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
+ <%= render :partial => "layouts/meta" %>
<%= yield :head %>
+ <%= yield :auto_discovery_link_tag %>
<%= csrf_meta_tag %>
- <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %>
-
+ <%= csp_meta_tag %>
+ <%= @title + " | " if @title %><%= t "layouts.project_name.title" %>
+<% end %>