X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fe6e837cfe77e1414998c0216defe7912e34bf75..1727cd7c2b066a4442f6714be7aa170f4d8c1eef:/app/views/layouts/_head.html.erb?ds=inline diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 5688c9ebd..83f1087dd 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -5,17 +5,17 @@ <%= 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" %> - <%= stylesheet_link_tag "leaflet.locationfilter" %> + <%= 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." }) %> + <%= 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 -%> @@ -26,16 +26,19 @@ 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 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] %> + <% end -%> + <% if session[:location] -%> OSM.location = <%= session[:location].to_json.html_safe %>; - <% end %> - + <% 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 -%>