X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4f2e9e0888593557315e3110cdbb8ef67fa901ff..e4b94f4e5ef195dd5743ab3a510caecb7525a3b7:/app/views/layouts/_head.html.erb
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 95984ca97..fbc9037fa 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,49 +1,40 @@
-
+<%= content_tag :head, :data => application_data do %>
+
+
<%= javascript_include_tag "application" %>
-
- <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
- <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
+ <%= 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" %>
- <%= 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" }) %>
+ <% [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 -%>
+ <%= favicon_link_tag "favicon-32x32.png", :rel => "icon", :sizes => "32x32", :type => "image/png" %>
+ <%= favicon_link_tag "favicon-194x194.png", :rel => "icon", :sizes => "194x194", :type => "image/png" %>
+ <%= 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" }) %>
+ <%= 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." }) %>
- <%= tag("meta", :property => "og:image", :content => image_path("osm_logo.png")) %>
+ <%= 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 %>
-
+ <%= @title + ' | ' if @title %><%= t 'layouts.project_name.title' %>
+<% end %>