Merge branch 'admin-page-checkbox-round-one' into 'master'

Updates the checkbox for multiple admin settings forms

See merge request gitlab-org/gitlab!84761

app/views/admin/application_settings/_eks.html.haml

@@ -9,15 +9,13 @@
       = _('Amazon EKS integration allows you to provision EKS clusters from GitLab.')
 
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-eks-settings'), html: { class: 'fieldset-form', id: 'eks-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-eks-settings'), html: { class: 'fieldset-form', id: 'eks-settings' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :eks_integration_enabled, class: 'form-check-input'
-            = f.label :eks_integration_enabled, class: 'form-check-label' do
-              = _('Enable Amazon EKS integration')
+          = f.gitlab_ui_checkbox_component :eks_integration_enabled,
+            _('Enable Amazon EKS integration')
         .form-group
           = f.label :eks_account_id, _('Account ID'), class: 'label-bold'
           = f.text_field :eks_account_id, class: 'form-control gl-form-input'

app/views/admin/application_settings/_external_authorization_service_form.html.haml

@@ -9,17 +9,14 @@
       = link_to _('Learn more.'), help_page_path('user/admin_area/settings/external_authorization'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
 
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-external-auth-settings'), html: { class: 'fieldset-form', id: 'external-auth-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-external-auth-settings'), html: { class: 'fieldset-form', id: 'external-auth-settings' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :external_authorization_service_enabled, class: 'form-check-input'
-            = f.label :external_authorization_service_enabled, class: 'form-check-label' do
-              = s_('ExternalAuthorization|Enable classification control using an external service')
-          %span.form-text.text-muted
-            = external_authorization_description
+          = f.gitlab_ui_checkbox_component :external_authorization_service_enabled,
+            s_('ExternalAuthorization|Enable classification control using an external service'),
+            help_text: external_authorization_description
         .form-group
           = f.label :external_authorization_service_url, s_('ExternalAuthorization|Service URL'), class: 'label-bold'
           = f.text_field :external_authorization_service_url, class: 'form-control gl-form-input'

app/views/admin/application_settings/_floc.html.haml

@@ -11,12 +11,11 @@
       = link_to sprite_icon('question-o'), 'https://github.com/WICG/floc', target: '_blank', rel: 'noopener noreferrer', class: 'has-tooltip', title: _('More information')
 
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-floc-settings'), html: { class: 'fieldset-form', id: 'floc-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-floc-settings'), html: { class: 'fieldset-form', id: 'floc-settings' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :floc_enabled, class: 'form-check-input'
-            = f.label :floc_enabled, s_('FloC|Enable FloC (Federated Learning of Cohorts)'), class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component :floc_enabled,
+          s_('FloC|Enable FloC (Federated Learning of Cohorts)')
       = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'

app/views/admin/application_settings/_gitpod.html.haml

@@ -12,14 +12,13 @@
 
 
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-gitpod-settings'), html: { class: 'fieldset-form', id: 'gitpod-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-gitpod-settings'), html: { class: 'fieldset-form', id: 'gitpod-settings' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :gitpod_enabled, class: 'form-check-input'
-            = f.label :gitpod_enabled, s_('Gitpod|Enable Gitpod integration'), class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component :gitpod_enabled,
+          s_('Gitpod|Enable Gitpod integration')
         .form-group
           = f.label :gitpod_url, s_('Gitpod|Gitpod URL'), class: 'label-bold'
           = f.text_field :gitpod_url, class: 'form-control gl-form-input', placeholder: s_('Gitpod|https://gitpod.example.com')

app/views/admin/application_settings/_kroki.html.haml

@@ -9,14 +9,13 @@
       = _('Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki.')
       = link_to _('Learn more.'), help_page_path('administration/integration/kroki.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-kroki-settings'), html: { class: 'fieldset-form', id: 'kroki-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-kroki-settings'), html: { class: 'fieldset-form', id: 'kroki-settings' } do |f|
       = form_errors(@application_setting) if expanded
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :kroki_enabled, class: 'form-check-input'
-            = f.label :kroki_enabled, _('Enable Kroki'), class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component :kroki_enabled,
+            _('Enable Kroki')
         .form-group
           = f.label :kroki_url, 'Kroki URL', class: 'label-bold'
           = f.text_field :kroki_url, class: 'form-control gl-form-input', placeholder: 'http://your-kroki-instance:8000'
@@ -31,8 +30,6 @@
             - container_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: container_link_url }
             = html_escape(_('To use the additional formats, you must start the required %{container_link_start}companion containers%{container_link_end}.')) % { container_link_start: container_link_start, container_link_end: '</a>'.html_safe }
         - kroki_available_formats.each do |format|
-            .form-check
-              = f.check_box format[:name], class: 'form-check-input'
-              = f.label format[:name], format[:label], class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component format[:name], format[:label]
 
       = f.submit _('Save changes'), class: "btn gl-button btn-confirm"

app/views/admin/application_settings/_mailgun.html.haml

@@ -8,14 +8,13 @@
     %p
       = _('Configure the %{link} integration.').html_safe % { link: link_to(_('Mailgun events'), 'https://documentation.mailgun.com/en/latest/user_manual.html#webhooks', target: '_blank', rel: 'noopener noreferrer') }
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-mailgun-settings'), html: { class: 'fieldset-form', id: 'mailgun-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-mailgun-settings'), html: { class: 'fieldset-form', id: 'mailgun-settings' } do |f|
       = form_errors(@application_setting) if expanded
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :mailgun_events_enabled, class: 'form-check-input'
-            = f.label :mailgun_events_enabled, _('Enable Mailgun event receiver'), class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component :mailgun_events_enabled,
+          _('Enable Mailgun event receiver')
         .form-group
           = f.label :mailgun_signing_key, _('Mailgun HTTP webhook signing key'), class: 'label-light'
           = f.text_field :mailgun_signing_key, class: 'form-control gl-form-input'

app/views/admin/application_settings/_plantuml.html.haml

@@ -9,14 +9,13 @@
       = _('Render diagrams in your documents using PlantUML.')
       = link_to _('Learn more.'), help_page_path('administration/integration/plantuml.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
-    = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-plantuml-settings'), html: { class: 'fieldset-form', id: 'plantuml-settings' } do |f|
+    = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-plantuml-settings'), html: { class: 'fieldset-form', id: 'plantuml-settings' } do |f|
       = form_errors(@application_setting) if expanded
 
       %fieldset
         .form-group
-          .form-check
-            = f.check_box :plantuml_enabled, class: 'form-check-input'
-            = f.label :plantuml_enabled, _('Enable PlantUML'), class: 'form-check-label'
+          = f.gitlab_ui_checkbox_component :plantuml_enabled,
+            _('Enable PlantUML')
         .form-group
           = f.label :plantuml_url, _('PlantUML URL'), class: 'label-bold'
           = f.text_field :plantuml_url, class: 'form-control gl-form-input', placeholder: 'http://your-plantuml-instance:8080'