Merge branch '7867-snowplow-integration-settings-are-rendered-incorrectly' into 'master'

Resolve "Snowplow integration settings are rendered incorrectly"

Closes #7867

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

ee/app/views/admin/application_settings/_snowplow.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
-  = form_errors(@application_setting)
+%section.settings.as-snowplow.no-animate#js-snowplow-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Snowplow
+    %button.btn.btn-default.js-settings-toggle{ type: 'button' }
+      = expanded ? _('Collapse') : _('Expand')
+    %p
+      = _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') }
+  .settings-content
 
-  %fieldset
-    .form-group
-      .form-check
-        = f.check_box :snowplow_enabled, class: 'form-check-input'
-        = f.label :snowplow_enabled, class: 'form-check-label' do
-          Enable Snowplow
-    .form-group
-      = f.label :snowplow_collector_uri, 'Collector URI', class: 'label-light'
-      = f.text_field :snowplow_collector_uri, class: 'form-control', placeholder: 'snowplow.example.com'
-    .form-group
-      = f.label :snowplow_site_id, class: 'label-light' do
-        Site ID
-      = f.text_field :snowplow_site_id, class: 'form-control'
-    .form-group
-      = f.label :snowplow_cookie_domain, class: 'label-light' do
-        Cookie domain
-      = f.text_field :snowplow_cookie_domain, class: 'form-control'
+    = form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+      = form_errors(@application_setting)
 
-  = f.submit 'Save changes', class: 'btn btn-success'
+      %fieldset
+        .form-group
+          .form-check
+            = f.check_box :snowplow_enabled, class: 'form-check-input'
+            = f.label :snowplow_enabled, class: 'form-check-label' do
+              Enable Snowplow
+        .form-group
+          = f.label :snowplow_collector_uri, 'Collector URI', class: 'label-light'
+          = f.text_field :snowplow_collector_uri, class: 'form-control', placeholder: 'snowplow.example.com'
+        .form-group
+          = f.label :snowplow_site_id, class: 'label-light' do
+            Site ID
+          = f.text_field :snowplow_site_id, class: 'form-control'
+        .form-group
+          = f.label :snowplow_cookie_domain, class: 'label-light' do
+            Cookie domain
+          = f.text_field :snowplow_cookie_domain, class: 'form-control'
+
+      = f.submit 'Save changes', class: 'btn btn-success'

ee/changelogs/unreleased/7867-snowplow-integration-settings-are-rendered-incorrectly.yml

+---
+title: Adds expandable/collapsable section for Snowplow
+merge_request: 7798
+author:
+type: other

locale/gitlab.pot

@@ -2101,6 +2101,9 @@ msgstr ""
 msgid "Configure storage path and circuit breaker settings."
 msgstr ""
 
+msgid "Configure the %{link} integration."
+msgstr ""
+
 msgid "Configure the way a user creates a new account."
 msgstr ""