X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..3d37044b67bfff18054682de8380bb3110d486d2:/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 c115ea59f..64cb4fd58 100644
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -2,23 +2,19 @@
<html>
<head>
<meta charset='utf-8'>
- <%= stylesheet_link_tag 'id' %>
+ <%= stylesheet_link_tag "id" %>
<!--[if !IE || gte IE 9]><!-->
- <%= javascript_include_tag 'id' %>
+ <%= javascript_include_tag "id" %>
<!-- <![endif]-->
</head>
<body>
-<% 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 %>
</body>
</html>