Merge branch 'master' into next

[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 dc8f8e3d91e96f15d7710151edcb2f237e9e6117..bb0506671cbdf917d109215e5dce64fc7cc6297a 100644 (file)
--- a/app/views/oauth_clients/_form.html.erb
+++ b/app/views/oauth_clients/_form.html.erb
@@ -1,23 +1,29 @@
-<div class="field">
-  <label for="client_application_name"><%= t'oauth_clients.form.name' %> (<%= t'oauth_clients.form.required' %>)</label><br/>
-  <%= f.text_field :name %>
+<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>

-<div class="field">
-  <label for="client_application_url"><%= t'oauth_clients.form.url' %> (<%= t'oauth_clients.form.required' %>)</label><br/>
-  <%= f.text_field :url %>
-</div>
-<div class="field">
-  <label for="client_application_callback_url"><%= t'oauth_clients.form.callback_url' %></label><br/>
-  <%= f.text_field :callback_url %>
-</div>
-<div class="field">
-  <label for="client_application_support_url"><%= t'oauth_clients.form.support_url' %></label><br/>
-  <%= f.text_field :support_url %>
-</div>
-<p><%= t'oauth_clients.form.requests' %></p>
-<% ClientApplication.all_permissions.each do |perm| %>
-<div class="field">
-  <%= f.check_box perm %>
-  <label for="client_application_<%= perm.to_s %>"><%= t('oauth_clients.form.' + perm.to_s) %></label><br/>
-</div>
-<% end %>