diff options
Diffstat (limited to 'app/views/admin/applications')
-rw-r--r-- | app/views/admin/applications/_form.html.haml | 25 | ||||
-rw-r--r-- | app/views/admin/applications/index.html.haml | 6 |
2 files changed, 13 insertions, 18 deletions
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index 83347034cc5..a8d5a45041d 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -2,39 +2,34 @@ = form_errors(application) = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label + .col-12 = f.label :name - .col-sm-10 - = f.text_field :name, class: 'form-control gl-form-input' + = f.text_field :name, class: 'form-control gl-form-input', data: { qa_selector: 'name_field' } = doorkeeper_errors_for application, :name = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label + .col-12 = f.label :redirect_uri - .col-sm-10 - = f.text_area :redirect_uri, class: 'form-control gl-form-input' + = f.text_area :redirect_uri, class: 'form-control gl-form-input', data: { qa_selector: 'redirect_uri_field' } = doorkeeper_errors_for application, :redirect_uri %span.form-text.text-muted Use one line per URI = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :trusted - .col-sm-10 - = f.gitlab_ui_checkbox_component :trusted, _('Trusted applications are automatically authorized on GitLab OAuth flow. It\'s highly recommended for the security of users that trusted applications have the confidential setting set to true.') + = f.gitlab_ui_checkbox_component :trusted, _('Trusted applications are automatically authorized on GitLab OAuth flow. It\'s highly recommended for the security of users that trusted applications have the confidential setting set to true.'), checkbox_options: { data: { qa_selector: 'trusted_checkbox' } } = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :confidential - .col-sm-10 = f.gitlab_ui_checkbox_component :confidential, _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.') .form-group.row - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :scopes - .col-sm-10 = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes, f: f - .form-actions - = f.submit _('Save application'), pajamas_button: true + .gl-mt-5 + = f.submit _('Save application'), pajamas_button: true, data: { qa_selector: 'save_application_button' } = link_to _('Cancel'), admin_applications_path, class: "gl-button btn btn-default btn-cancel" diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml index d6a0974d10f..60aa7ae1c56 100644 --- a/app/views/admin/applications/index.html.haml +++ b/app/views/admin/applications/index.html.haml @@ -10,16 +10,16 @@ - 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' + = image_tag 'illustrations/empty-state/empty-admin-apps-md.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') - = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm) do + = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm, button_options: { data: { qa_selector: 'new_application_button' } }) do = s_('New application') - else %hr - = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm) do + = render Pajamas::ButtonComponent.new(href: new_admin_application_path, variant: :confirm, button_options: { data: { qa_selector: 'new_application_button' } }) do = s_('New application') .table-responsive |