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

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

diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb
index 8e940e341f194630b2897b7609a38c82f43bb18a..b4c2558cfebe816f88d0c8aa592d9adb107049a3 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -2,6 +2,8 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
   <h1><%= t ".title" %></h1>
 <% end %>
 

+<%= render :partial => "settings_menu" %>
+

 <% unless @tokens.empty? %>
 <h3><%= t ".my_tokens" %></h3>
 <p><%= t ".list_tokens" %></p>
 <% unless @tokens.empty? %>
 <h3><%= t ".my_tokens" %></h3>
 <p><%= t ".list_tokens" %></p>


@@ -19,7 +21,7 @@
       <td><%= token.authorized_at %></td>
       <td>
         <%= form_tag({ :controller => "oauth", :action => "revoke" }) do %>
       <td><%= token.authorized_at %></td>
       <td>
         <%= form_tag({ :controller => "oauth", :action => "revoke" }) do %>

-          <%= hidden_field_tag "token", token.token %>
+          <%= hidden_field_tag "token", token.token, :autocomplete => "off" %>

           <%= submit_tag t(".revoke"), :class => "btn btn-sm btn-primary" %>
         <% end %>
       </td>
           <%= submit_tag t(".revoke"), :class => "btn btn-sm btn-primary" %>
         <% end %>
       </td>


@@ -32,10 +34,14 @@
 <p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>
 <% else %>
 <p><%= t ".registered_apps" %></p>
 <p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>
 <% else %>
 <p><%= t ".registered_apps" %></p>

-<% @client_applications.each do |client| %>
-  <div class="client_application">
-    <%= link_to client.name, :action => :show, :id => client.id %>
-  </div>
-<% end %>
+<ul>
+  <% @client_applications.each do |client| %>
+    <li class="client_application">
+      <%= link_to client.name, :action => :show, :id => client.id %>
+    </li>
+  <% end %>
+</ul>

 <% end %>
 <% end %>

-<h3><%= link_to t(".register_new"), :action => :new %></h3>
+<% if Settings.oauth_10_registration -%>
+<%= link_to t(".register_new"), { :action => :new }, :class => "btn btn-outline-primary" %>
+<% end -%>