Merge branch '11259-polish-saml-sso-configuration-page' into 'master'

Resolve "Polish SAML SSO configuration page"

Closes #11259

See merge request gitlab-org/gitlab-ee!13982

ee/app/views/groups/saml_providers/_form.html.haml

-%section.saml_provider#js-saml-settings-form
+%section.saml_provider#js-saml-settings-form.prepend-top-default
   = form_for [group, saml_provider], url: group_saml_providers_path do |f|
     .form-group
       = form_errors(saml_provider)
-      = f.label :enabled, class: 'label-bold mb-0' do
-        = s_('GroupSAML|Enable')
-      .form-text= s_('GroupSAML|Enable SAML authentication for this group.')
       %label.toggle-wrapper.mb-0.js-group-saml-enabled-toggle-area
         %button{ type: 'button',
           class: "js-project-feature-toggle project-feature-toggle d-inline #{'is-checked' if saml_provider.enabled?}",
@@ -13,11 +10,9 @@
           %span.toggle-icon
             = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
             = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+        %span.d-inline.font-weight-normal.align-text-bottom.ml-3= s_('GroupSAML|Enable SAML authentication for this group.')
     - if Feature.enabled?(:enforced_sso, group)
       .form-group
-        = f.label :enforced_sso, class: 'label-bold mb-0' do
-          = s_('GroupSAML|Enforced SSO')
-        .form-text= s_('GroupSAML|Enforce SSO-only authentication for this group.')
         %label.toggle-wrapper.mb-0.js-group-saml-enforced-sso-toggle-area
           %button{ type: 'button',
             class: "js-project-feature-toggle js-group-saml-enforced-sso-toggle project-feature-toggle d-inline qa-enforced-sso-toggle-button #{'is-checked' if saml_provider.enforced_sso?}",
@@ -26,14 +21,12 @@
             %span.toggle-icon
               = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
               = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+          %span.form-text.d-inline.font-weight-normal.align-text-bottom.ml-3= s_('GroupSAML|Enforce SSO-only authentication for this group.')
         .form-text.text-muted.js-group-saml-enforced-sso-helper-text{ style: "display: #{'none' if saml_provider.enabled?} #{'block' unless saml_provider.enabled?}" }
           %span
             = s_('GroupSAML|To be able to enable enforced SSO, you first need to enable SAML authentication.')
     - if Feature.enabled?(:group_managed_accounts, group)
       .form-group
-        = f.label :enforced_group_managed_accounts, class: 'label-bold mb-0' do
-          = s_('GroupSAML|Group managed accounts')
-        .form-text= s_('GroupSAML|Enforce users to have dedicated group managed accounts for this group.')
         %label.toggle-wrapper.mb-0.js-group-saml-enforced-group-managed-accounts-toggle-area
           %button{ type: 'button',
             class: "js-project-feature-toggle js-group-saml-enforced-group-managed-accounts-toggle project-feature-toggle d-inline #{'is-checked' if saml_provider.enforced_group_managed_accounts?}",
@@ -42,6 +35,7 @@
             %span.toggle-icon
               = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
               = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+          %span.form-text.d-inline.font-weight-normal.align-text-bottom.ml-3= s_('GroupSAML|Enforce users to have dedicated group managed accounts for this group.')
         .form-text.text-muted.js-group-saml-enforced-group-managed-accounts-helper-text{ style: "display: #{'none' if saml_provider.enforced_sso?} #{'block' unless saml_provider.enforced_sso?}" }
           %span
             = s_('GroupSAML|To be able to enable group managed accounts, you first need to enable enforced SSO.')

ee/app/views/groups/saml_providers/_info.html.haml

-%section.saml-settings.prepend-top-10.append-bottom-20
+%section.saml-settings.prepend-top-10
   .well-segment
     %p= _("To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:")
     %ol

ee/app/views/groups/saml_providers/show.html.haml

@@ -10,6 +10,11 @@
       = icon('external-link')
   .col-lg-9
     = render 'info'
+%section.row.border-top.mt-4
+  .col-lg-3.append-bottom-default
+    %h4.page-title
+      = s_('GroupSAML|Configuration')
+  .col-lg-9
     = render 'form', group: @group, saml_provider: @saml_provider
 - if Feature.enabled?(:group_scim, @group)
   %section.row.border-top.mt-4
@@ -18,3 +23,4 @@
         = s_('GroupSAML|SCIM Token')
     .col-lg-9
       = render 'scim_token'
+

ee/changelogs/unreleased/11259-polish-saml-sso-configuration-page.yml

+---
+title: Polish SAML SSO configuration page
+merge_request: 13982
+author:
+type: changed

locale/gitlab.pot

@@ -6503,7 +6503,7 @@ msgstr ""
 msgid "GroupSAML|Certificate fingerprint"
 msgstr ""
 
-msgid "GroupSAML|Enable"
+msgid "GroupSAML|Configuration"
 msgstr ""
 
 msgid "GroupSAML|Enable SAML authentication for this group."
@@ -6524,9 +6524,6 @@ msgstr ""
 msgid "GroupSAML|Generate a SCIM token to set up your System for Cross-Domain Identity Management."
 msgstr ""
 
-msgid "GroupSAML|Group managed accounts"
-msgstr ""
-
 msgid "GroupSAML|Identity provider single sign on URL"
 msgstr ""