5 files changed, 53 insertions, 45 deletions
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index b8f114455..894222c2a 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -4,6 +4,7 @@ class Settings::ApplicationsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_application, only: [:show, :update, :destroy, :regenerate]
 
   def index
     @applications = current_user.applications.page(params[:page])
@@ -16,22 +17,20 @@ class Settings::ApplicationsController < ApplicationController
     )
   end
 
-  def show
-    @application = current_user.applications.find(params[:id])
-  end
+  def show; end
 
   def create
     @application = current_user.applications.build(application_params)
+
     if @application.save
-      redirect_to settings_applications_path, notice: I18n.t('application.created')
+      redirect_to settings_applications_path, notice: I18n.t('applications.created')
     else
       render :new
     end
   end
 
   def update
-    @application = current_user.applications.find(params[:id])
-    if @application.update_attributes(application_params)
+    if @application.update(application_params)
       redirect_to settings_applications_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show
@@ -39,21 +38,23 @@ class Settings::ApplicationsController < ApplicationController
   end
 
   def destroy
-    @application = current_user.applications.find(params[:id])
     @application.destroy
-    redirect_to settings_applications_path, notice: t('application.destroyed')
+    redirect_to settings_applications_path, notice: I18n.t('applications.destroyed')
   end
 
   def regenerate
-    @application = current_user.applications.find(params[:application_id])
     @access_token = current_user.token_for_app(@application)
     @access_token.destroy
 
-    redirect_to settings_application_path(@application), notice: t('access_token.regenerated')
+    redirect_to settings_application_path(@application), notice: I18n.t('applications.token_regenerated')
   end
 
   private
 
+  def set_application
+    @application = current_user.applications.find(params[:id])
+  end
+
   def application_params
     params.require(:doorkeeper_application).permit(
       :name,
diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml
index 9dbe23466..536f69e04 100644
--- a/app/views/settings/applications/_fields.html.haml
+++ b/app/views/settings/applications/_fields.html.haml
@@ -1,4 +1,11 @@
-= f.input :name, hint: t('activerecord.attributes.doorkeeper/application.name')
-= f.input :website, hint: t('activerecord.attributes.doorkeeper/application.website')
-= f.input :redirect_uri, hint: t('activerecord.attributes.doorkeeper/application.redirect_uri')
-= f.input :scopes, hint: t('activerecord.attributes.doorkeeper/application.scopes')
+.fields-group
+  = f.input :name, placeholder: t('activerecord.attributes.doorkeeper/application.name')
+  = f.input :website, placeholder: t('activerecord.attributes.doorkeeper/application.website')
+
+.fields-group
+  = f.input :redirect_uri, wrapper: :with_block_label, label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri')
+
+  %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: Doorkeeper.configuration.native_redirect_uri)
+
+.fields-group
+  = f.input :scopes, wrapper: :with_label, label: t('activerecord.attributes.doorkeeper/application.scopes'), hint: t('doorkeeper.applications.help.scopes')
diff --git a/app/views/settings/applications/index.html.haml b/app/views/settings/applications/index.html.haml
index 17035f96c..eea550388 100644
--- a/app/views/settings/applications/index.html.haml
+++ b/app/views/settings/applications/index.html.haml
@@ -6,15 +6,14 @@
     %tr
       %th= t('doorkeeper.applications.index.application')
       %th= t('doorkeeper.applications.index.scopes')
-      %th= t('doorkeeper.applications.index.created_at')
       %th
   %tbody
     - @applications.each do |application|
       %tr
         %td= link_to application.name, settings_application_path(application)
-        %th= application.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.join('<br />').html_safe
-        %td= l application.created_at
-        %td= table_link_to 'show', t('doorkeeper.applications.index.show'), settings_application_path(application)
-        %td= table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
+        %th= application.scopes
+        %td
+          = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
+
 = paginate @applications
-= link_to t('add_new'), new_settings_application_path, class: 'button'
+= link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'
diff --git a/app/views/settings/applications/new.html.haml b/app/views/settings/applications/new.html.haml
index 61406a31f..5274a430c 100644
--- a/app/views/settings/applications/new.html.haml
+++ b/app/views/settings/applications/new.html.haml
@@ -1,9 +1,8 @@
 - content_for :page_title do
   = t('doorkeeper.applications.new.title')
+
+= simple_form_for @application, url: settings_applications_path do |f|
+  = render 'fields', f: f
   
-.form-container
-  = simple_form_for @application, url: settings_applications_path do |f|
-    = render 'fields', f:f
-    
-    .actions
-      = f.button :button, t('.create'), type: :submit
+  .actions
+    = f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit
diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml
index 9f1a11986..4d8555111 100644
--- a/app/views/settings/applications/show.html.haml
+++ b/app/views/settings/applications/show.html.haml
@@ -1,27 +1,29 @@
 - content_for :page_title do
   = t('doorkeeper.applications.show.title', name: @application.name)
 
-
-%p.hint= t('application.warning')
-  
-%div
-  %h3= t('application.uid')
-  %code= @application.uid
-
-%div 
-  %h3= t('application.secret')
-  %code= @application.secret
-
-%div
-  %h3= t('access_token.your_token')
-  %code= current_user.token_for_app(@application).token
-
-= link_to t('access_token.regenerate'), settings_application_regenerate_path(@application), method: :put,  class: 'button'
-
-%hr
+%p.hint= t('applications.warning')
+
+%table.table
+  %tbody
+    %tr  
+      %th= t('doorkeeper.applications.show.application_id')
+      %td
+        %code= @application.uid
+    %tr
+      %th= t('doorkeeper.applications.show.secret')
+      %td
+        %code= @application.secret
+    %tr
+      %th{ rowspan: 2}= t('applications.your_token')
+      %td
+        %code= current_user.token_for_app(@application).token
+    %tr
+      %td= table_link_to 'refresh', t('applications.regenerate_token'), regenerate_settings_application_path(@application), method: :post
+
+%hr/
 
 = simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
-  = render 'fields', f:f
+  = render 'fields', f: f
     
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit