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

[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 80cae9a6d3439135d9701ec4c2dd3d245e53eff3..b4c2558cfebe816f88d0c8aa592d9adb107049a3 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -2,35 +2,46 @@
   <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>
-  <tr><th><%= t ".application" %></th>
-    <th><%= t ".issued_at" %></th><th>&nbsp;</th></tr>
+<table class="table table-sm">
+  <thead>
+    <tr>
+      <th><%= t ".application" %></th>
+      <th><%= t ".issued_at" %></th>
+      <th>&nbsp;</th>
+    </tr>
+  </thead>

   <% @tokens.each do |token| %>
   <% @tokens.each do |token| %>

-    <%= content_tag_for :tr, token do %>
+    <tr>

       <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") %>
-  <% end %>
+        <%= 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>
       </td>

-    <% end %>
+    </tr>

   <% end %>
 </table>
 <% end %>
 <h3><%= t ".my_apps" %></h3>
 <% if @client_applications.empty? %>
   <% end %>
 </table>
 <% 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_for client do %>
-    <%= link_to client.name, :action => :show, :id => client.id %>
+<ul>
+  <% @client_applications.each do |client| %>
+    <li class="client_application">
+      <%= link_to client.name, :action => :show, :id => client.id %>
+    </li>

   <% end %>
   <% end %>

+</ul>

 <% end %>
 <% 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 -%>