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

[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 6f0af1e28d7e915b22ee263eb8e3bf670ddf562b..bb0506671cbdf917d109215e5dce64fc7cc6297a 100644 (file)
--- a/app/views/oauth_clients/_form.html.erb
+++ b/app/views/oauth_clients/_form.html.erb
@@ -1,40 +1,29 @@
-<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">
-  <label for="client_application_allow_read_prefs">Request permission to read the user preferences.</label><br/>
-  <%= f.check_box :allow_read_prefs %>
-</div>
-<div class="field">
-  <label for="client_application_allow_write_prefs">Request permission to write the user preferences.</label><br/>
-  <%= f.check_box :allow_write_prefs %>
-</div>
-<div class="field">
-  <label for="client_application_allow_write_diary">Request permission to create diary entries, comments and friends.</label><br/>
-  <%= f.check_box :allow_write_diary %>
-</div>
-<div class="field">
-  <label for="client_application_allow_write_api">Request permission to write the API on the user's behalf.</label><br/>
-  <%= f.check_box :allow_write_api %>
-</div>
-<div class="field">
-  <label for="client_application_allow_read_gpx">Request permission to read the user's private GPS traces.</label><br/>
-  <%= f.check_box :allow_read_gpx %>
-</div>
-<div class="field">
-  <label for="client_application_allow_write_gpx">Request permission to upload GPS traces as the user.</label><br/>
-  <%= f.check_box :allow_write_gpx %>
+<div class='standard-form'>
+  <fieldset>
+    <div class="form-row">
+      <label class='standard-label' for="client_application_name"><%= t '.name' %> (<%= t '.required' %>)</label>
+      <%= f.text_field :name %>
+    </div>
+    <div class="form-row">
+      <label class='standard-label' for="client_application_url"><%= t '.url' %> (<%= t '.required' %>)</label>
+      <%= f.text_field :url %>
+    </div>
+    <div class="form-row">
+      <label class='standard-label' for="client_application_callback_url"><%= t '.callback_url' %></label>
+      <%= f.text_field :callback_url %>
+    </div>
+    <div class="form-row">
+      <label class='standard-label' for="client_application_support_url"><%= t '.support_url' %></label>
+      <%= f.text_field :support_url %>
+    </div>
+  </fieldset>
+  <fieldset class='form-divider'>
+      <p><%= t '.requests' %></p>
+      <% ClientApplication.all_permissions.each do |perm| %>
+        <div class="form-row">
+          <%= f.check_box perm %>
+          <label class='standard-label' for="client_application_<%= perm.to_s %>"><%= t('.' + perm.to_s) %></label>
+        </div>
+      <% end %>
+  </fieldset>

 </div>
 </div>