Merge b18c1bf into b96f386

app/views/oauth2_applications/_application.html.erb

@@ -1,7 +1,7 @@
 <tr>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
-      <li><%= application.name %></li>
+      <li><%= link_to application.name, oauth_application_path(application) %></li>
       <% application.redirect_uri.split.each do |uri| -%>
         <li class="text-muted"><%= uri %></li>
       <% end -%>

app/views/oauth2_applications/_form.html.erb

@@ -1,6 +1,6 @@
 <%= f.text_field :name %>
-<%= f.text_area :redirect_uri, :help => t(".redirect_uri_help") %>
-<%= f.form_group :confidential, :help => t(".confidential_help") do %>
+<%= f.text_area :redirect_uri %>
+<%= f.form_group :confidential do %>
   <%= f.check_box :confidential %>
 <% end %>
 <%= f.collection_check_boxes :scopes, Oauth.scopes, :name, :description %>

app/views/oauth2_applications/index.html.erb

@@ -2,12 +2,22 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
+<% if @applications.length > 0 %>
+  <table class="table table-borderless table-striped">
+    <thead>
+      <th><%= t ".name" %></th>
+      <th><%= t ".permissions" %></th>
+      <th></th>
+      <th></th>
+    </thead>
+    <tbody>
+      <%= render :partial => "application", :collection => @applications %>
+    </tbody>
+  </table>
+<% else %>
+  <p><%= t ".no_applications_html", :oauth2 => link_to(t(".oauth_2"), "https://oauth.net/2/") %></p>
+<% end %>
+
 <p>
   <%= link_to t(".new"), new_oauth_application_path, :class => "btn btn-outline-primary" %>
 </p>
-
-<table class="table table-borderless table-striped">
-  <tbody>
-    <%= render :partial => "application", :collection => @applications %>
-  </tbody>
-</table>

app/views/oauth2_applications/show.html.erb

@@ -42,3 +42,8 @@
     </td>
   </tr>
 </table>
+
+<div>
+  <%= link_to t(".edit"), edit_oauth_application_path(@application), :class => "btn btn-outline-primary" %>
+  <%= link_to t(".delete"), oauth_application_path(@application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
+</td>

app/views/oauth2_authorizations/new.html.erb

@@ -10,31 +10,29 @@
   <% end -%>
 </ul>
 
-<div class="container">
-  <div class="row justify-content-start">
-    <div class="col-auto pl-0">
-      <%= bootstrap_form_tag :action => :create do |f| %>
-        <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
-        <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
-        <%= f.hidden_field :state, :value => @pre_auth.state %>
-        <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
-        <%= f.hidden_field :scope, :value => @pre_auth.scope %>
-        <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
-        <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
-        <%= f.primary t(".authorize") %>
-      <% end %>
-    </div>
-    <div class="col-auto pl-0">
-      <%= bootstrap_form_tag :action => :destroy, :html => { :method => :delete } do |f| %>
-        <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
-        <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
-        <%= f.hidden_field :state, :value => @pre_auth.state %>
-        <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
-        <%= f.hidden_field :scope, :value => @pre_auth.scope %>
-        <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
-        <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
-        <%= f.submit t(".deny") %>
-      <% end %>
-    </div>
+<div class="row justify-content-start no-gutters mx-n1">
+  <div class="col-auto mx-1">
+    <%= bootstrap_form_tag :action => :create do |f| %>
+      <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
+      <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
+      <%= f.hidden_field :state, :value => @pre_auth.state %>
+      <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
+      <%= f.hidden_field :scope, :value => @pre_auth.scope %>
+      <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
+      <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
+      <%= f.primary t(".authorize") %>
+    <% end %>
+  </div>
+  <div class="col-auto mx-1">
+    <%= bootstrap_form_tag :action => :destroy, :html => { :method => :delete } do |f| %>
+      <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
+      <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
+      <%= f.hidden_field :state, :value => @pre_auth.state %>
+      <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
+      <%= f.hidden_field :scope, :value => @pre_auth.scope %>
+      <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
+      <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
+      <%= f.submit t(".deny") %>
+    <% end %>
   </div>
 </div>

app/views/oauth2_authorized_applications/_application.html.erb

@@ -1,6 +1,6 @@
 <tr>
   <td class="align-middle">
-    <%= application.name %>
+    <%= link_to application.name, oauth_application_path(application) %>
   </td>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">

app/views/oauth2_authorized_applications/index.html.erb

@@ -2,13 +2,17 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<table class="table table-borderless table-striped">
-  <thead>
-    <th><%= t ".application" %></th>
-    <th><%= t ".permissions" %></th>
-    <th></th>
-  </thead>
-  <tbody>
-    <%= render :partial => "application", :collection => @applications %>
-  </tbody>
-</table>
+<% if @applications.length > 0 %>
+  <table class="table table-borderless table-striped">
+    <thead>
+      <th><%= t ".application" %></th>
+      <th><%= t ".permissions" %></th>
+      <th></th>
+    </thead>
+    <tbody>
+      <%= render :partial => "application", :collection => @applications %>
+    </tbody>
+  </table>
+<% else %>
+  <p><%= t ".no_applications_html", :oauth2 => link_to(t(".oauth_2"), "https://oauth.net/2/") %></p>
+<% end %>

config/locales/en.yml

@@ -21,6 +21,9 @@ en:
       client_application:
         create: Register
         update: Update
+      doorkeeper_application:
+        create: Register
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -143,6 +146,9 @@ en:
         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:
+      doorkeeper/application:
+        confidential: "Application will be used where the client secret can be kept confidential, eg mobile apps and single page apps"
+        redirect_uri: "Use one line per URI"
       trace:
         tagstring: comma delimited
       user_block:
@@ -485,6 +491,11 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Application Registered.
   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"
@@ -2329,7 +2340,11 @@ en:
   oauth2_applications:
     index:
       title: "My client applications"
-      new: "Create new application"
+      no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
+      oauth_2: "OAuth 2"
+      new: "Register new application"
+      name: "Name"
+      permissions: "Permissions"
     application:
       edit: "Edit"
       delete: "Delete"
@@ -2339,14 +2354,14 @@ en:
     edit:
       title: "Edit your application"
     show:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
       client_id: "Client ID"
       client_secret: "Client Secret"
       client_secret_warning: "Make sure to save this secret - it will not be accessible again"
       permissions: "Permissions"
       redirect_uris: "Redirect URIs"
-    form:
-      redirect_uri_help: "Use one line per URI"
-      confidential_help: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)"
     not_found:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
@@ -2364,6 +2379,7 @@ en:
       title: "My authorized applications"
       application: "Application"
       permissions: "Permissions"
+      no_applications_html: "You have not yet authorized any %{oauth2} applications."
     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"