X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9fa49c99485b0ba1242c6d13e12df9ab1532987..b6163f0fc29740b4d9953a8c1fe47875ce2ecab0:/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 5dfc49aa0..8a0f62d92 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,22 +1,20 @@ <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'rails' %> - <%= 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 %> <%= csrf_meta_tag %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> + <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>