Merge remote-tracking branch 'upstream/pull/5213'

[rails.git] / app / views / site / id.html.erb
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb

index e4dbf2d5336d7ac80c87744890a4ab2866414fd2..64cb4fd58e84be24042079846fb0364899454b72 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -6,28 +6,15 @@
    <!--[if !IE || gte IE 9]><!-->
    <%= javascript_include_tag "id" %>
    <!-- <![endif]-->
-  <style type='text/css'>
-    /* apply document-level styling */
-    html, body {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      padding: 0;
-    }
-  </style>
  </head>
  <body>
-<% 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 %>
  </body>
  </html>