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

[rails.git] / app / views / oauth_clients / _form.html.erb

diff --git a/app/views/oauth_clients/_form.html.erb b/app/views/oauth_clients/_form.html.erb
index e55b016e982a2ce7e11eb28979c675160714996c..4554504121c3872874df01f8a37ac580146297bc 100644 (file)
--- a/app/views/oauth_clients/_form.html.erb
+++ b/app/views/oauth_clients/_form.html.erb
@@ -1,40 +1,11 @@
-<div class="field">
-       <label for="client_application_name">Name*</label><br/>
-       <%= f.text_field :name %>
-</div>
-<div class="field">
-       <label for="client_application_url">Main Application URL*</label><br/>
-       <%= f.text_field :url %>
-</div>
-<div class="field">
-       <label for="client_application_callback_url">Callback URL*</label><br/>
-       <%= f.text_field :callback_url %>
-</div>
-<div class="field">
-       <label for="client_application_support_url">Support URL</label><br/>
-       <%= f.text_field :support_url %>
-</div>
-<div class="field">
-  <%= f.check_box :allow_read_prefs %>
-  <label for="client_application_allow_read_prefs">Request permission to read the user preferences.</label><br/>
-</div>
-<div class="field">
-  <%= f.check_box :allow_write_prefs %>
-  <label for="client_application_allow_write_prefs">Request permission to write the user preferences.</label><br/>
-</div>
-<div class="field">
-  <%= f.check_box :allow_write_diary %>
-  <label for="client_application_allow_write_diary">Request permission to create diary entries, comments and friends.</label><br/>
-</div>
-<div class="field">
-  <%= f.check_box :allow_write_api %>
-  <label for="client_application_allow_write_api">Request permission to write the API on the user's behalf.</label><br/>
-</div>
-<div class="field">
-  <%= f.check_box :allow_read_gpx %>
-  <label for="client_application_allow_read_gpx">Request permission to read the user's private GPS traces.</label><br/>
-</div>
-<div class="field">
-  <%= f.check_box :allow_write_gpx %>
-  <label for="client_application_allow_write_gpx">Request permission to upload GPS traces as the user.</label><br/>
-</div>
+<%= f.text_field :name %>
+<%= f.text_field :url %>
+<%= f.text_field :callback_url %>
+<%= f.text_field :support_url %>
+<div class='form-group'>
+  <p><%= t ".requests" %></p>
+  <% ClientApplication.all_permissions.each do |perm| %>
+    <%= f.check_box perm %>
+  <% end %>
+</div>
+<%= f.primary %>