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

[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 54bb4f9f6f4133d17341adc6f0751f7810fe30ab..a08b3c0ffb4e3a5749cdb6e16218ec21a183ac16 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -2,10 +2,12 @@
   <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>

-<table>
+<table class="table table-sm">

   <thead>
     <tr>
       <th><%= t ".application" %></th>
   <thead>
     <tr>
       <th><%= t ".application" %></th>


@@ -18,9 +20,9 @@
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>

-        <%= form_tag :controller => "oauth", :action => "revoke" do %>
-          <%= hidden_field_tag "token", token.token %>
-          <%= submit_tag t(".revoke") %>
+        <%= form_tag({ :controller => "oauth", :action => "revoke" }) do %>
+          <%= hidden_field_tag "token", token.token, :autocomplete => "off" %>
+          <%= submit_tag t(".revoke"), :class => "btn btn-sm btn-primary" %>

         <% end %>
       </td>
     </tr>
         <% end %>
       </td>
     </tr>


@@ -29,13 +31,15 @@
 <% end %>
 <h3><%= t ".my_apps" %></h3>
 <% if @client_applications.empty? %>
 <% end %>
 <h3><%= t ".my_apps" %></h3>
 <% if @client_applications.empty? %>

-<p><%= raw(t(".no_apps", :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
+<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>

 <% else %>
 <p><%= t ".registered_apps" %></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>
+<%= link_to t(".register_new"), { :action => :new }, :class => "btn btn-outline-primary" %>