X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43bfebdd9e83685cbc999f46a3a88e85f9960cbc..40012189cb311510e545202d688294b9a8490ab1:/app/views/layouts/_head.html.erb?ds=sidebyside diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index ae90442d0..84f566e81 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -9,7 +9,7 @@ + <%= 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" }) %> @@ -25,16 +25,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 -%> <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %>