X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0814b4096c443e2ab3c09baa058aa81a00d205d1..89f8f7af3539588c234496dd769f9042199bd248:/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 8830a8692..a9d127835 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,15 +1,15 @@ - - - - +<%= 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" %> - + <%= favicon_link_tag "favicon.ico" if browser.ie? %> <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%> <%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %> <% end -%> @@ -18,43 +18,25 @@ <%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %> <%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %> <%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %> - <%= tag("link", { :rel => "mask-icon", :href => asset_path("tag-icon.svg"), :color => "#7ebc6f" }) %> - <%= tag("link", { :rel => "manifest", :href => asset_path("manifest.json") }) %> - <%= tag("meta", { :name => "msapplication-config", :content => asset_path("browserconfig.xml") }) %> - <%= tag("meta", { :name => "msapplication-TileColor", :content => "#00a300" }) %> - <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") }) %> - <%= tag("meta", { :name => "theme-color", :content => "#ffffff" }) %> - <%= 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("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %> + <%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %> + <%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %> + <%= tag("meta", :name => "msapplication-TileColor", :content => "#00a300") %> + <%= tag("meta", :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png")) %> + <%= tag("meta", :name => "theme-color", :content => "#ffffff") %> + <%= canonical_tag %> + <% if Settings.key?(:publisher_url) -%> + <%= tag("link", :rel => "publisher", :href => Settings.publisher_url) %> + <% end -%> + <%= 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.") %> <%= opengraph_tags(@title) %> <% if flash[:piwik_goal] -%> <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %> - <% end -%> - <%= style_rules %> + <% end -%> <%= yield :head %> <%= yield :auto_discovery_link_tag %> <%= csrf_meta_tag %> - - <%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %> - + <%= csp_meta_tag %> + <%= @title + " | " if @title %><%= t "layouts.project_name.title" %> +<% end %>