Replace use of Event with jQuery methods

[rails.git] / app / views / layouts / _head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index e315ef373fc35876135880e3a5c83c200e12c5cc..8a0f62d922a9ddc4b13f0c21c1c18c5903736743 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -8,11 +8,13 @@
   <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %>
   <!--[if IE]><%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
   <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %>
   <!--[if IE]><%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->

+  <%= 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 => "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 %>
   <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
   <%= style_rules %>
   <%= yield :head %>
   <%= csrf_meta_tag %>

-  <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
+  <title><%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %></title>

 </head>
 </head>