X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2a84871de6551256ca6c421708dce9fc8fdb8102..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 6e876e166..3300dc89c 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,19 +1,18 @@ -
- - <%= javascript_strings %> - <%= javascript_include_tag "site" %> - <%= javascript_include_tag "menu" %> - - <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> - <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %> - - <%= favicon_link_tag "favicon.ico" %> - <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> - <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("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 %> -