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

[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 d53181c172ef2776e269e5a53ddc1a3d58ce8e8e..8576ea3ab77c7cdbf761d8167f12f71d7a01896b 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -2,18 +2,17 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
   <h1><%= t ".title" %></h1>
 <% end %>
 

-<p><%= raw t(".request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, user_path(current_user))) %></p>
+<p><%= t(".request_access_html", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, user_path(current_user))) %></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><%= t '.allow_to' %></p>
-  <ul>
-  <% @token.client_application.permissions.each do |perm| %>
-    <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= label_tag perm.to_s, t(".#{perm}") %></li>
-  <% end %>
-  </ul>
-  <p><%= submit_tag t(".grant_access") %></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 %>
 <% end %>