X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4f2e9e0888593557315e3110cdbb8ef67fa901ff..d770636f90f406eec64c4130b1e54308444d3f69:/app/views/layouts/_head.html.erb diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 95984ca97..0ee5bf9c0 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,49 +1,16 @@ -
- +<%= tag.head :data => application_data do %> + + + <%= javascript_include_tag "es6" unless browser.es6? %> <%= 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)" %> + <%= 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" %> - - <%= 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 %> - -