X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/82b4c8e3f08697abdb62dd037f72085c9154d5b0..0e0c89b95c16abd7bc548bea7bff03cbb715b3b3:/app/views/layouts/_head.html.erb diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 118100df6..56c3051b2 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,13 +1,13 @@ -
+<%= content_tag :head, :data => application_data do %> <%= 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" %> <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%> @@ -18,42 +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("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" }) %> - <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> + <%= canonical_tag %> + <% if defined?(PUBLISHER_URL) -%> + <%= tag("link", { :rel => "publisher", :href => 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 %> - -