X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ad58d1411289ad241a49abb87e414ff13b60173..ff73d1225554de6f6ec2aee7bcd9faa527c0d552:/app/views/layouts/_head.html.erb
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 6e2920a7c..19bed2bd3 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,17 +1,23 @@
- <%= javascript_include_tag "site" %>
- <%= javascript_include_tag "menu" %>
+ <%= javascript_include_tag "application" %>
- <%= 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" %>
-
+ <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
+ <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
+ <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
+ <%= stylesheet_link_tag "leaflet-all", :media => "screen, 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 => asset_path("osm.xml") }) %>
<%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+ <% if flash[:piwik_goal] -%>
+ <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
+ <% end -%>
<%= style_rules %>
<%= yield :head %>
<%= csrf_meta_tag %>
@@ -19,6 +25,16 @@
I18n.defaultLocale = "<%= I18n.default_locale %>";
I18n.locale = "<%= I18n.locale %>";
I18n.fallbacks = true;
+
+ <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+ OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>;
+ <% end %>
+
+ <% if session[:location] %>
+ OSM.location = <%= session[:location].to_json.html_safe %>;
+ <% end %>
+
+ OSM.preferred_editor = <%= preferred_editor.to_json.html_safe %>;
<%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>