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

[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 d698728f5e7c12c3ff0f352093f545cb30dfc752..b4c2558cfebe816f88d0c8aa592d9adb107049a3 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -1,33 +1,47 @@
-<h1><%= t'oauth_clients.index.title' %></h1>
+<% content_for :heading do %>
+  <h1><%= t ".title" %></h1>
+<% end %>
+
+<%= render :partial => "settings_menu" %>
+
 <% unless @tokens.empty? %>
-<h3><%= t'oauth_clients.index.my_tokens' %></h3>
-<p><%= t'oauth_clients.index.list_tokens' %></p>
-<table>
-  <tr><th><%= t'oauth_clients.index.application' %></th>
-    <th><%= t'oauth_clients.index.issued_at' %></th><th>&nbsp;</th></tr>
-  <% @tokens.each do |token|%>
-    <%= content_tag_for :tr, token do %>
+<h3><%= t ".my_tokens" %></h3>
+<p><%= t ".list_tokens" %></p>
+<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| %>
+    <tr>
       <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('oauth_clients.index.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>
-    <% end %>
-  <% end %>    
+    </tr>
+  <% end %>
 </table>
 <% end %>
-<h3><%= t'oauth_clients.index.my_apps' %></h3>
+<h3><%= t ".my_apps" %></h3>
 <% if @client_applications.empty? %>
-<p><%= raw(t('oauth_clients.index.no_apps', :oauth => "<a href=\"http://oauth.net\">OAuth</a>")) %></p>
+<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>
 <% else %>
-<p><%= t'oauth_clients.index.registered_apps' %></p>
-<% @client_applications.each do |client|%>
-  <%= div_for client do %>
-    <%= link_to client.name, :action => :show, :id => client.id %>
+<p><%= t ".registered_apps" %></p>
+<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('oauth_clients.index.register_new'), :action => :new %></h3>
+<% if Settings.oauth_10_registration -%>
+<%= link_to t(".register_new"), { :action => :new }, :class => "btn btn-outline-primary" %>
+<% end -%>