diff --git a/ee/app/views/groups/settings/domain_verification/_certificate.html.haml b/ee/app/views/groups/settings/domain_verification/_certificate.html.haml index 969f77eaac114f63875679c541b2a96d130fd2fe..a1134397e2292acde6905f6ec60be36a5591cf93 100644 --- a/ee/app/views/groups/settings/domain_verification/_certificate.html.haml +++ b/ee/app/views/groups/settings/domain_verification/_certificate.html.haml @@ -23,7 +23,7 @@ s_("DomainVerification|Manually enter certificate information"), radio_options: { checked: !auto_ssl_available_and_enabled } -.js-shown-unless-auto-ssl.custom-control{ class: ("gl-display-none" if auto_ssl_available_and_enabled) } +.js-shown-unless-auto-ssl.custom-control.gl-pl-0{ class: ("gl-display-none" if auto_ssl_available_and_enabled) } - if domain_presenter.user_defined_certificate? .form-group.gl-form-group.gl-max-w-80 = render Pajamas::CardComponent.new(body_options: { class: 'gl-display-flex gl-align-items-center gl-justify-content-space-between gl-p-5' }) do |c| diff --git a/ee/app/views/groups/settings/domain_verification/index.html.haml b/ee/app/views/groups/settings/domain_verification/index.html.haml index 8f88b90af87fbd4ebd3890f603acecc91da7093d..6706b634d206c9c5403dcaf8417c7c192ae68020 100644 --- a/ee/app/views/groups/settings/domain_verification/index.html.haml +++ b/ee/app/views/groups/settings/domain_verification/index.html.haml @@ -2,36 +2,47 @@ %h1.page-title.gl-font-size-h-display = _('Domain Verification') - = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { class: 'float-right'}, href: new_group_settings_domain_verification_path(@group)) do - = s_("DomainVerification|Add Domain") -%p +%p.gl-text-secondary = s_('DomainVerification|The following domains are configured for projects in this group. Users with email addresses that match a verified domain do not need to confirm their account.') = link_to s_('DomainVerification|How do I configure a domain?'), help_page_path('user/enterprise_user/index.md', anchor: 'verified-domains-for-groups') -%table.gl-table.gl-w-full - %thead - %tr - %th= _('Domain') - %th= _('Source Project') - %th= _('Verification status') - %th= _('Actions') - %tbody - %tr.js-domain-empty-state{ class: @domains.empty? ? '' : 'gl-display-none' } - %td{ colspan: 4, class: 'gl-py-6! text-center' } - = s_("DomainVerification|No domains configured. Create a domain in a project in this group hierarchy.") - - @domains.each do |domain| - %tr.js-domain-row{ id: "domain#{domain.id}" } - %td - = domain.domain - %td - - project = domain.project - = link_to project.full_path, project_path(project) - %td - = domain.verified? ? _('Verified') : _('Unverified') - %td - .btn-group - - if can_verify_group_domain?(domain) - = render Pajamas::ButtonComponent.new(icon: "redo", href: verify_group_settings_domain_verification_path(@group, domain), button_options: { data: { method: :post } }) - = render Pajamas::ButtonComponent.new(icon: "pencil", href: group_settings_domain_verification_path(@group, domain)) - = render Pajamas::ButtonComponent.new(variant: :danger, icon: "remove", href: group_settings_domain_verification_path(@group, domain), button_options: { data: { confirm: s_("DomainVerification|Are you sure you want to delete this domain?"), confirm_btn_variant: "danger", remote: true, method: :delete, title: s_("DomainVerification|Delete domain") }, 'aria-label': s_("DomainVerification|Delete domain"), class: "js-remove-domain" }) += render Pajamas::CardComponent.new(card_options: { class: 'gl-new-card js-toggle-container' }, header_options: { class: 'gl-new-card-header' }, body_options: { class: 'gl-new-card-body gl-px-0' }) do |c| + - c.with_header do + .gl-new-card-title-wrapper + %h3.gl-new-card-title + = _('Domains') + .gl-new-card-count + = sprite_icon('link', css_class: 'gl-mr-2') + = @domains.size + .gl-new-card-actions + = render Pajamas::ButtonComponent.new(size: :small, href: new_group_settings_domain_verification_path(@group)) do + = s_("DomainVerification|Add Domain") + - c.with_body do + .table-holder + %table.table.b-table.gl-table.b-table-stacked-md{ role: 'table' } + %thead + %tr + %th= _('Domain') + %th= _('Source project') + %th= _('Verification status') + %th.gl-text-right= _('Actions') + %tbody + %tr.js-domain-empty-state{ class: @domains.empty? ? '' : 'gl-display-none!' } + %td{ colspan: 4, class: 'gl-py-6! text-center' } + = s_("DomainVerification|No domains configured. Create a domain in a project in this group hierarchy.") + - @domains.each do |domain| + %tr.js-domain-row{ id: "domain#{domain.id}" } + %td{ class: 'gl-vertical-align-middle!', data: { label: _('Domain') } } + = domain.domain + %td{ class: 'gl-vertical-align-middle!', data: { label: _('Source project') } } + - project = domain.project + = link_to project.full_path, project_path(project) + %td{ class: 'gl-vertical-align-middle!', data: { label: _('Verifications status') } } + = domain.verified? ? _('Verified') : _('Unverified') + %td{ data: { label: _('Actions') } } + .btn-group.gl-float-right.gl-mt-n2.gl-mb-n2{ class: 'gl-text-left! gl-pl-0!' } + - if can_verify_group_domain?(domain) + = render Pajamas::ButtonComponent.new(icon: "redo", href: verify_group_settings_domain_verification_path(@group, domain), button_options: { data: { method: :post } }) + = render Pajamas::ButtonComponent.new(icon: "pencil", href: group_settings_domain_verification_path(@group, domain)) + = render Pajamas::ButtonComponent.new(category: :secondary, variant: :danger, icon: "remove", href: group_settings_domain_verification_path(@group, domain), button_options: { data: { confirm: s_("DomainVerification|Are you sure you want to delete this domain?"), confirm_btn_variant: "danger", remote: true, method: :delete, title: s_("DomainVerification|Delete domain") }, 'aria-label': s_("DomainVerification|Delete domain"), class: "js-remove-domain" }) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 96fb9d44511d2f5f522f380f87df4b177b8c4240..0ee756cd608a2f47244a266be77f46cfd92ba1bc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -16872,6 +16872,9 @@ msgstr "" msgid "DomainVerification|To verify ownership of your domain, add the above key to a TXT record within your DNS configuration within seven days. %{link_to_help}" msgstr "" +msgid "Domains" +msgstr "" + msgid "Don't have a group?" msgstr "" @@ -44459,9 +44462,6 @@ msgstr "" msgid "Source IP" msgstr "" -msgid "Source Project" -msgstr "" - msgid "Source branch" msgstr "" @@ -44486,6 +44486,9 @@ msgstr "" msgid "Source is not available" msgstr "" +msgid "Source project" +msgstr "" + msgid "Source project cannot be found." msgstr "" @@ -51017,6 +51020,9 @@ msgstr "" msgid "VerificationReminder|You’ll now be able to take advantage of free compute minutes on shared runners." msgstr "" +msgid "Verifications status" +msgstr "" + msgid "Verified" msgstr ""