X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..5944feb008005f67a09240d4b9ad1e2513f7633b:/app/views/site/id.html.erb?ds=inline diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index c115ea59f..64cb4fd58 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -2,23 +2,19 @@ - <%= stylesheet_link_tag 'id' %> + <%= stylesheet_link_tag "id" %> - <%= javascript_include_tag 'id' %> + <%= javascript_include_tag "id" %> -<% data = {} -%> -<% if defined? ID_KEY %> -<% token = current_user.access_token(ID_KEY) %> -<% data[:token] = token.token -%> -<% data[:token_secret] = token.secret -%> -<% data[:consumer_key] = token.client_application.key -%> -<% data[:consumer_secret] = token.client_application.secret -%> -<% end %> -<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%> -<% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%> -<% data[:asset_map] = assets("iD").to_json -%> -<%= content_tag :div, "", :id => "id-container", :data => data %> +<% data = {} + if Settings.key?(:id_application) + token = current_user.oauth_token(Settings.id_application) + data[:token] = token.token + end + data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s + data[:asset_map] = assets("iD").to_json %> +<%= tag.div "", :id => "id-container", :data => data %>