X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2d205a59eb4af5a861cbdf20f498e747554ea9f..30f21edbc2d0b92c6401b04baa14788802a04b45:/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 a262e0b76..8a0f62d92 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,20 +1,20 @@
<%= javascript_strings %>
- <%= javascript_include_tag 'prototype' %>
- <%= javascript_include_tag 'site' %>
- <%= javascript_include_tag 'menu' %>
-
- <%= stylesheet_link_tag 'common' %>
- <%= stylesheet_link_tag t('html.dir') %>
-
- <%= stylesheet_link_tag 'small', :media => "only screen and (max-width:641px)" %>
- <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 642px)" %>
- <%= stylesheet_link_tag 'print', :media => "print" %>
+ <%= javascript_include_tag "site" %>
+ <%= javascript_include_tag "menu" %>
+
+ <%= 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" %>
+
+ <%= favicon_link_tag "favicon.ico" %>
+ <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/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." }) %>
<%= style_rules %>
<%= yield :head %>
- <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %>
+ <%= csrf_meta_tag %>
+ <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>