Commit 89745be8 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch '36347-add-missing-empty-state-for-admin-applications' into 'master'

Add empty state for Instance OAuth app page

See merge request gitlab-org/gitlab!83279
parents 554e3e67 b2659c6b
- 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 } } %button{ class: submit_btn_css, data: { path: admin_application_path(application), name: application.name } }
= _('Destroy') = _('Destroy')
- page_title _("Applications") - page_title s_('AdminArea|Instance OAuth applications')
%h3.page-title %h3.page-title
= _('System OAuth applications') = s_('AdminArea|Instance OAuth applications')
%p.light %p.light
= _('System OAuth applications don\'t belong to any user and can only be managed by admins') - docs_link_path = help_page_path('integration/oauth_provider')
%hr - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: docs_link_path }
%p= link_to _('New application'), new_admin_application_path, class: 'gl-button btn btn-confirm' = 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 }
.table-responsive
%table.table - 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 %thead
%tr %tr
%th %th
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
%th %th
%tbody.oauth-applications %tbody.oauth-applications
- @applications.each do |application| - @applications.each do |application|
%tr{ :id => "application_#{application.id}" } %tr{ id: "application_#{application.id}" }
%td= link_to application.name, admin_application_path(application) %td= link_to application.name, admin_application_path(application)
%td= application.redirect_uri %td= application.redirect_uri
%td= @application_counts[application.id].to_i %td= @application_counts[application.id].to_i
......
...@@ -2505,6 +2505,9 @@ msgstr "" ...@@ -2505,6 +2505,9 @@ msgstr ""
msgid "AdminArea|Included Free in license" msgid "AdminArea|Included Free in license"
msgstr "" msgstr ""
msgid "AdminArea|Instance OAuth applications"
msgstr ""
msgid "AdminArea|Latest groups" msgid "AdminArea|Latest groups"
msgstr "" msgstr ""
...@@ -2517,6 +2520,9 @@ msgstr "" ...@@ -2517,6 +2520,9 @@ msgstr ""
msgid "AdminArea|Maintainer" msgid "AdminArea|Maintainer"
msgstr "" msgstr ""
msgid "AdminArea|Manage applications for your instance that can use GitLab as an %{docs_link_start}OAuth provider%{docs_link_end}."
msgstr ""
msgid "AdminArea|Minimal access" msgid "AdminArea|Minimal access"
msgstr "" msgstr ""
...@@ -2529,6 +2535,9 @@ msgstr "" ...@@ -2529,6 +2535,9 @@ msgstr ""
msgid "AdminArea|New user" msgid "AdminArea|New user"
msgstr "" msgstr ""
msgid "AdminArea|No applications found"
msgstr ""
msgid "AdminArea|Owner" msgid "AdminArea|Owner"
msgstr "" msgstr ""
...@@ -36499,12 +36508,6 @@ msgstr "" ...@@ -36499,12 +36508,6 @@ msgstr ""
msgid "System Info" msgid "System Info"
msgstr "" msgstr ""
msgid "System OAuth applications"
msgstr ""
msgid "System OAuth applications don't belong to any user and can only be managed by admins"
msgstr ""
msgid "System default (%{default})" msgid "System default (%{default})"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment