diff options
Diffstat (limited to 'app/views/admin/applications')
-rw-r--r-- | app/views/admin/applications/_delete_form.html.haml | 3 | ||||
-rw-r--r-- | app/views/admin/applications/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/applications/index.html.haml | 77 |
3 files changed, 49 insertions, 35 deletions
diff --git a/app/views/admin/applications/_delete_form.html.haml b/app/views/admin/applications/_delete_form.html.haml index 16ec8014c5e..f9fd5864176 100644 --- a/app/views/admin/applications/_delete_form.html.haml +++ b/app/views/admin/applications/_delete_form.html.haml @@ -1,5 +1,4 @@ +- submit_btn_css ||= 'gl-button btn btn-danger btn-danger-secondary btn-sm js-application-delete-button' -- submit_btn_css ||= 'gl-button btn btn-danger btn-sm js-application-delete-button' %button{ class: submit_btn_css, data: { path: admin_application_path(application), name: application.name } } = _('Destroy') - diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index a1990ad5750..925b3681298 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -1,4 +1,4 @@ -= form_for [:admin, @application], url: @url, html: {role: 'form'} do |f| += gitlab_ui_form_for [:admin, @application], url: @url, html: {role: 'form'} do |f| = form_errors(application) = content_tag :div, class: 'form-group row' do @@ -45,7 +45,7 @@ .col-sm-2.col-form-label.pt-0 = f.label :scopes .col-sm-10 - = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes + = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes, f: f .form-actions = f.submit _('Save application'), class: "gl-button btn btn-confirm wide" diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml index 86a4ab00ba3..890155ee604 100644 --- a/app/views/admin/applications/index.html.haml +++ b/app/views/admin/applications/index.html.haml @@ -1,36 +1,51 @@ -- page_title _("Applications") +- page_title s_('AdminArea|Instance OAuth applications') + %h3.page-title - = _('System OAuth applications') + = s_('AdminArea|Instance OAuth applications') %p.light - = _('System OAuth applications don\'t belong to any user and can only be managed by admins') -%hr -%p= link_to _('New application'), new_admin_application_path, class: 'gl-button btn btn-confirm' -.table-responsive - %table.table - %thead - %tr - %th - = _('Name') - %th - = _('Callback URL') - %th - = _('Clients') - %th - = _('Trusted') - %th - = _('Confidential') - %th - %th - %tbody.oauth-applications - - @applications.each do |application| - %tr{ :id => "application_#{application.id}" } - %td= link_to application.name, admin_application_path(application) - %td= application.redirect_uri - %td= @application_counts[application.id].to_i - %td= application.trusted? ? _('Yes'): _('No') - %td= application.confidential? ? _('Yes'): _('No') - %td= link_to 'Edit', edit_admin_application_path(application), class: 'gl-button btn btn-link' - %td= render 'delete_form', application: application + - docs_link_path = help_page_path('integration/oauth_provider') + - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: docs_link_path } + = s_('AdminArea|Manage applications for your instance that can use GitLab as an %{docs_link_start}OAuth provider%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe } + +- if @applications.empty? + %section.empty-state.gl-text-center.gl-display-flex.gl-flex-direction-column + .svg-content.svg-150 + = image_tag 'illustrations/empty-state/empty-admin-apps.svg', class: 'gl-max-w-full' + + .gl-max-w-full.gl-m-auto + %h1.h4.gl-font-size-h-display= s_('AdminArea|No applications found') + = link_to _('New application'), new_admin_application_path, class: 'btn gl-button btn-confirm' + +- else + %hr + %p= link_to _('New application'), new_admin_application_path, class: 'gl-button btn btn-confirm' + + .table-responsive + %table.b-table.gl-table.gl-w-full{ role: 'table' } + %thead + %tr + %th + = _('Name') + %th + = _('Callback URL') + %th + = _('Clients') + %th + = _('Trusted') + %th + = _('Confidential') + %th + %th + %tbody.oauth-applications + - @applications.each do |application| + %tr{ id: "application_#{application.id}" } + %td= link_to application.name, admin_application_path(application) + %td= application.redirect_uri + %td= @application_counts[application.id].to_i + %td= application.trusted? ? _('Yes'): _('No') + %td= application.confidential? ? _('Yes'): _('No') + %td= link_to 'Edit', edit_admin_application_path(application), class: 'gl-button btn btn-link' + %td= render 'delete_form', application: application = paginate @applications, theme: 'gitlab' |