X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/72e33046c80bddc0ca9b1336786dcb4b349137f7..edfbbf7336a38162b2d996ebca21918a5d6039a0:/app/views/layouts/_head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 206905b94..32e5af198 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,19 +1,59 @@
 <head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
-  <%= javascript_strings %>
-  <%= javascript_include_tag 'prototype' %>
-  <%= 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 -->
-  <%= 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" %>
-  <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
+  <!--[if lt IE 9]><%= javascript_include_tag "html5shiv" %><![endif]-->
+  <%= javascript_include_tag "application" %>
+  <%= 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" %>
+  <!--[if IE]>
+    <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
+    <%= favicon_link_tag "favicon.ico" %>
+  <![endif]-->
+  <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
+  <%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
+  <% end -%>
+  <%= favicon_link_tag "favicon-32x32.png", :sizes => "32x32", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-194x194.png", :sizes => "194x194", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-96x96.png", :sizes => "96x96", :type => "image/png" %>
+  <%= favicon_link_tag "android-chrome-192x192.png", :sizes => "192x192", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-16x16.png", :sizes => "16x16", :type => "image/png" %>
+  <%= tag("link", { :rel => "manifest", :href => asset_path("manifest.json") }) %>
+  <%= tag("meta", { :name => "msapplication-TileColor", :content => "#00a300" }) %>
+  <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") }) %>
+  <%= tag("meta", { :name => "theme-color", :content => "#ffffff" }) %>
+  <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
+  <%= 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 %>
-  <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
+  <%= yield :auto_discovery_link_tag %>
+  <%= csrf_meta_tag %>
+  <script type="text/javascript">
+    I18n.defaultLocale = "<%= I18n.default_locale %>";
+    I18n.locale = "<%= I18n.locale %>";
+    I18n.fallbacks = true;
+    <% if @user -%>
+    OSM.user = <%= @user.id.to_json.html_safe %>;
+    <% unless @user.home_lon.nil? or @user.home_lat.nil? -%>
+    OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>;
+    <% end -%>
+    <% end -%>
+    <% if session[:location] -%>
+    OSM.location = <%= session[:location].to_json.html_safe %>;
+    <% end -%>
+    OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>;
+    <% if @oauth -%>
+    OSM.oauth_token = "<%= @oauth.token %>";
+    OSM.oauth_token_secret = "<%= @oauth.secret %>";
+    OSM.oauth_consumer_key = "<%= @oauth.client_application.key %>";
+    OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>";
+    <% end -%>
+  </script>
+  <title><%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %></title>
 </head>
