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

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

diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb
index 55fffd4823eba1e288723386b822d6be55bb5442..c7b10f1379ebd6c19d4fa4142abe2ffb21de3ed6 100644 (file)
--- a/app/views/oauth_clients/show.html.erb
+++ b/app/views/oauth_clients/show.html.erb
@@ -1,33 +1,33 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.title', :app_name => @client_application.name) %></h1>
+  <h1><%= t(".title", :app_name => @client_application.name) %></h1>

 <% end %>
 <% end %>

-<div class='prose'>
-  <p>
-    <strong><%= t '.key' %></strong> <%= @client_application.key %>
-  </p>
-  <p>
-    <strong><%= t '.secret' %></strong> <%= @client_application.secret %>
-  </p>
-  <p>
-    <strong><%= t '.url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.request_token_path %>
-  </p>
-  <p>
-    <strong><%= t '.access_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.access_token_path %>
-  </p>
-  <p>
-    <strong><%= t '.authorize_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.authorize_path %>
-  </p>

 
 

-  <p><%= t '.requests' %></p>
-  <ul><% @client_application.permissions.each do |perm| %>
-  <div class="field">
-    <li><%= t('oauth_clients.form.' + perm.to_s) %></li>
-  </div>
-  <% end %></ul>
+<%= render :partial => "settings_menu" %>

 
 

-  <p><%= t '.support_notice' %></p>
+<dl class="row">
+  <dt class="col-sm-3"><%= t ".key" %></dt>
+  <dd class="col-sm-9"><%= @client_application.key %></dt>
+  <dt class="col-sm-3"><%= t ".secret" %></dt>
+  <dd class="col-sm-9"><%= @client_application.secret %></dd>
+  <dt class="col-sm-3"><%= t ".url" %></dt>
+  <dd class="col-sm-9">http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.request_token_path %></dd>
+  <dt class="col-sm-3"><%= t ".access_url" %></dt>
+  <dd class="col-sm-9">http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.access_token_path %></dd>
+  <dt class="col-sm-3"><%= t ".authorize_url" %></dt>
+  <dd class="col-sm-9">http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.authorize_path %></dd>
+</dl>
+
+<div>
+  <p><%= t ".requests" %></p>
+  <ul>
+    <% @client_application.permissions.each do |perm| %>
+      <li><%= t("activerecord.attributes.client_application.#{perm}") %></li>
+    <% end %>
+  </ul>
+  <p><%= t ".support_notice" %></p>

 </div>
 </div>

-<div class="buttons">
-  <%= button_to t('.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "oauth-edit" %>
-  <%= button_to t('.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('.confirm') }, :class => "oauth-delete deemphasize" %>
+
+<div>
+  <%= link_to t(".edit"), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "btn btn-outline-primary" %>
+  <%= link_to t(".delete"), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t(".confirm") }, :class => "btn btn-outline-danger" %>

 </div>
 </div>