3 files changed, 10 insertions, 49 deletions
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index e7e17502da2..74eda21d5bd 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -40,5 +40,5 @@
       = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
 
   .form-actions
-    = f.submit 'Submit', class: "gl-button btn btn-confirm wide"
-    = link_to "Cancel", admin_applications_path, class: "gl-button btn btn-default btn-cancel"
+    = f.submit _('Save application'), class: "gl-button btn btn-confirm wide"
+    = link_to _('Cancel'), admin_applications_path, class: "gl-button btn btn-default btn-cancel"
diff --git a/app/views/admin/applications/new.html.haml b/app/views/admin/applications/new.html.haml
index 4d4b6b0c994..731cb51e2e4 100644
--- a/app/views/admin/applications/new.html.haml
+++ b/app/views/admin/applications/new.html.haml
@@ -1,6 +1,7 @@
-- breadcrumb_title _("Applications")
-- page_title _("New Application")
+- breadcrumb_title _("Add new application")
+- page_title _("Add new application")
 
-%h3.page-title New application
+%h3.page-title
+  = _("Add new application")
 - @url = admin_applications_path
 = render 'form', application: @application
diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml
index 8d643a7a4bc..8dcd5f81c23 100644
--- a/app/views/admin/applications/show.html.haml
+++ b/app/views/admin/applications/show.html.haml
@@ -3,47 +3,7 @@
 %h3.page-title
   Application: #{@application.name}
 
-.table-holder.oauth-application-show
-  %table.table
-    %tr
-      %td
-        = _('Application ID')
-      %td
-        .clipboard-group
-          .input-group
-            %input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true }
-            .input-group-append
-              = clipboard_button(target: '#application_id', title: _("Copy ID"), class: "gl-button btn btn-default")
-    %tr
-      %td
-        = _('Secret')
-      %td
-        .clipboard-group
-          .input-group
-            %input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true }
-            .input-group-append
-              = clipboard_button(target: '#secret', title: _("Copy secret"), class: "gl-button btn btn-default")
-    %tr
-      %td
-        = _('Callback URL')
-      %td
-        - @application.redirect_uri.split.each do |uri|
-          %div
-            %span.monospace= uri
-    %tr
-      %td
-        Trusted
-      %td
-        = @application.trusted? ? 'Y' : 'N'
-
-    %tr
-      %td
-        Confidential
-      %td
-        = @application.confidential? ? 'Y' : 'N'
-
-    = render "shared/tokens/scopes_list", token: @application
-
-.form-actions
-  = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'
+= render 'shared/doorkeeper/applications/show',
+  edit_path: edit_admin_application_path(@application),
+  delete_path: admin_application_path(@application),
+  show_trusted_row: true