-<head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
- <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
- <!--[if lt IE 9]><%= javascript_include_tag "html5shiv" %><![endif]-->
+<%= tag.head :data => application_data do %>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <%= javascript_include_tag "es6" unless browser.es6? %>
<%= javascript_include_tag "application" %>
- <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %>
- <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %>
+ <%= javascript_include_tag "i18n/#{I18n.locale}" %>
+ <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
<%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
<%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
- <!--[if IE]>
- <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
- <![endif]-->
- <%= favicon_link_tag "favicon.ico" %>
- <%= favicon_link_tag "osm_logo_57.png", :rel => "apple-touch-icon", :sizes => "57x57", :type => "image/png" %>
- <%= favicon_link_tag "osm_logo_72.png", :rel => "apple-touch-icon", :sizes => "72x72", :type => "image/png" %>
- <%= favicon_link_tag "osm_logo_114.png", :rel => "apple-touch-icon", :sizes => "114x114", :type => "image/png" %>
- <%= favicon_link_tag "osm_logo_144.png", :rel => "apple-touch-icon", :sizes => "144x144", :type => "image/png" %>
- <%= favicon_link_tag "osm_logo_228.png", :rel => "icon", :sizes => "228x228", :type => "image/png" %>
- <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("osm_logo_144.png") }) %>
- <%= 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." }) %>
- <%= tag("meta", :property => "og:image", :content => image_path("osm_logo.png")) %>
- <% if flash[:piwik_goal] -%>
- <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
- <% end -%>
- <%= style_rules %>
+ <%= render :partial => "layouts/meta" %>
<%= yield :head %>
<%= yield :auto_discovery_link_tag %>
<%= csrf_meta_tag %>
- <script type="text/javascript">
- I18n.defaultLocale = "<%= I18n.default_locale %>";
- I18n.locale = "<%= I18n.locale %>";
- I18n.fallbacks = true;
- <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? -%>
- OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>;
- <% end -%>
- <% if session[:location] -%>
- OSM.location = <%= session[:location].to_json.html_safe %>;
- <% end -%>
- OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>;
- <% if @oauth -%>
- OSM.oauth_token = "<%= @oauth.token %>";
- OSM.oauth_token_secret = "<%= @oauth.secret %>";
- OSM.oauth_consumer_key = "<%= @oauth.client_application.key %>";
- OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>";
- <% end -%>
- </script>
- <title><%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %></title>
-</head>
+ <meta name="csp-nonce" content="<%= content_security_policy_style_nonce %>" />
+ <title><%= "#{@title} | " if @title %><%= t "layouts.project_name.title" %></title>
+<% end %>
projects / rails.git / blobdiff