X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..2e1f6428e7d03a109db57b0d0614ecd2c0e5d5c1:/app/views/site/id.html.erb?ds=sidebyside diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index f8d0f5858..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 Settings.key?(:id_key) %> -<% token = current_user.access_token(Settings.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 %>