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

[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 8f9e0a0b1da03b89a8bbe4ad2bbe4dad39712312..b4c2558cfebe816f88d0c8aa592d9adb107049a3 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -1,39 +1,47 @@
-<div class="flash"><%= flash[:notice] %></div>
-<h1>OAuth Client Applications</h1>
+<% content_for :heading do %>
+  <h1><%= t ".title" %></h1>
+<% end %>
+
+<%= render :partial => "settings_menu" %>
+

 <% unless @tokens.empty? %>
 <% unless @tokens.empty? %>

-<p>The following tokens have been issued to applications in your name</p>
-<table>
-  <tr><th>Application</th><th>Issued</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>
       <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 "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 %>
-  <% end %>    
+    </tr>
+  <% end %>

 </table>
 <% end %>
 </table>
 <% end %>

-<h3>Application Developers</h3>
+<h3><%= t ".my_apps" %></h3>

 <% if @client_applications.empty? %>
 <% if @client_applications.empty? %>

-       <p>
-               Do you have an application you would like to register for use with us using the <a href="http://oauth.net">OAuth</a> standard?
-       </p>
-       <p>
-               You must register your web application before it can make OAuth requests to this service
-       </p>
+<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>

 <% else %>
 <% else %>

-       <p>
-               You have the following client applications registered:
-       </p>
-       <% @client_applications.each do |client|%>
-               <% div_for client do %>
-                       <%= link_to client.name, :action => :show, :id => client.id %>
-               <% end %>
-       <% end %>
+<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 "Register your application", :action => :new %></h3>
+<% if Settings.oauth_10_registration -%>
+<%= link_to t(".register_new"), { :action => :new }, :class => "btn btn-outline-primary" %>
+<% end -%>