Replace request.request_uri with request.fullpath

[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 517e021463367d67007be270a444c9b5d063652a..5dfc49aa039624fdd8a47bb33b710d0651fe30ec 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -2,17 +2,21 @@
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
   <%= javascript_strings %>
   <%= javascript_include_tag 'prototype' %>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
   <%= javascript_strings %>
   <%= javascript_include_tag 'prototype' %>

+  <%= javascript_include_tag 'rails' %>

   <%= javascript_include_tag 'site' %>
   <%= javascript_include_tag 'menu' %>
   <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
   <%= stylesheet_link_tag 'common' %>
   <%= javascript_include_tag 'site' %>
   <%= javascript_include_tag 'menu' %>
   <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
   <%= stylesheet_link_tag 'common' %>

+  <%= stylesheet_link_tag t('html.dir') %>

   <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
   <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->

-  <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
-  <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %> 
+  <%= 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" %>
   <%= stylesheet_link_tag 'print', :media => "print" %>

+  <%= 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("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
   <%= style_rules %>
   <%= yield :head %>
   <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
   <%= 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>
 </head>
   <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
 </head>