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

[rails.git] / app / views / oauth / authorize.html.erb

diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb
index 987997de2258598cadd5314c822a1b61881d132f..b8fe11f75b1ffdbdc7bab0e02d006e3bd73982e4 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -1,14 +1,18 @@
-<h1>Authorize access to your account</h1>
-<p>Would you like to authorize <%= link_to @token.client_application.name,@token.client_application.url %> (<%= link_to @token.client_application.url,@token.client_application.url %>) to access your account?</p>
-<% form_tag authorize_url do %>
-  <%= hidden_field_tag "oauth_token", @token.token %>
-  <%- if params[:oauth_callback] -%>
-  <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
-<%- end -%>
-<p>
-       <%= check_box_tag 'authorize' %> authorize access
-</p>
-<p>
-       <%= submit_tag %>
-</p>
-<% end %>
\ No newline at end of file
+<% content_for :heading do %>
+  <h1><%= t ".title" %></h1>
+<% end %>
+
+<p><%= t(".request_access_html", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, current_user)) %></p>
+
+<%= bootstrap_form_tag do |f| %>
+  <%= f.hidden_field :oauth_token, :value => @token.token %>
+  <% if params[:oauth_callback] -%>
+    <%= f.hidden_field :oauth_callback, :value => params[:oauth_callback] %>
+  <% end -%>
+  <%= f.form_group :permissions, :label => { :text => t(".allow_to") } do %>
+    <% @token.client_application.permissions.each do |perm| -%>
+      <%= f.check_box perm, :value => "yes", :checked => @token.read_attribute(perm), :label => t(".#{perm}") %>
+    <% end -%>
+  <% end -%>
+  <%= f.primary t(".grant_access") %>
+<% end %>