Adds rail

[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 1897cfff37ef68f440b39a242aa40c5f0ab61b82..32073727455f39ad5f87138c122075707b4014a9 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -9,14 +9,21 @@
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
   <!--[if IE]>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
   <!--[if IE]>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>

+    <%= favicon_link_tag "favicon.ico" %>

   <![endif]-->
   <![endif]-->

-  <%= favicon_link_tag "favicon.ico" %>
-  <%= favicon_link_tag "osm_logo_57.png", :rel => "apple-touch-icon", :sizes => "57x57", :type => "image/png" %>
-  <%= favicon_link_tag "osm_logo_72.png", :rel => "apple-touch-icon", :sizes => "72x72", :type => "image/png" %>
-  <%= favicon_link_tag "osm_logo_114.png", :rel => "apple-touch-icon", :sizes => "114x114", :type => "image/png" %>
-  <%= favicon_link_tag "osm_logo_144.png", :rel => "apple-touch-icon", :sizes => "144x144", :type => "image/png" %>
-  <%= favicon_link_tag "osm_logo_228.png", :rel => "icon", :sizes => "228x228", :type => "image/png" %>
-  <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("osm_logo_144.png") }) %>
+  <% [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", :rel => "icon", :sizes => "32x32", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-194x194.png", :rel => "icon", :sizes => "194x194", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
+  <%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
+  <%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
+  <%= tag("link", { :rel => "manifest", :href => asset_path("manifest.json") }) %>
+  <%= tag("meta", { :name => "msapplication-config", :content => asset_path("browserconfig.xml") }) %>
+  <%= 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("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." }) %>


@@ -26,14 +33,18 @@
   <% end -%>  
   <%= style_rules %>
   <%= yield :head %>
   <% end -%>  
   <%= style_rules %>
   <%= yield :head %>

+  <%= yield :auto_discovery_link_tag %>

   <%= csrf_meta_tag %>
   <script type="text/javascript">
     I18n.defaultLocale = "<%= I18n.default_locale %>";
     I18n.locale = "<%= I18n.locale %>";
     I18n.fallbacks = true;
   <%= csrf_meta_tag %>
   <script type="text/javascript">
     I18n.defaultLocale = "<%= I18n.default_locale %>";
     I18n.locale = "<%= I18n.locale %>";
     I18n.fallbacks = true;

-    <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? -%>
+    <% 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 -%>
     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 -%>
     <% if session[:location] -%>
     OSM.location = <%= session[:location].to_json.html_safe %>;
     <% end -%>


@@ -45,5 +56,5 @@
     OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>";
     <% end -%>
   </script>
     OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>";
     <% end -%>
   </script>

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

 </head>
 </head>