X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b8445ad3b20be74b3ef46edf85fb0c0635225182..853dc286b9c9093d0c1ad2082671111316703e4f:/app/views/layouts/_head.html.erb
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 3ddb73551..a1f11f700 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,19 +1,49 @@
- <%= javascript_strings %>
- <%= javascript_include_tag "site" %>
- <%= javascript_include_tag "menu" %>
+ <%= javascript_include_tag "application" %>
- <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %>
- <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
- <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %>
-
+ <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %>
+ <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %>
+ <%= 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 => "/opensearch/osm.xml" }) %>
+ <%= 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 %>
<%= yield :head %>
<%= csrf_meta_tag %>
- <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %>
+
+ <%= @title %>