Fix Analytics blueprint tabs and move Cookie Panel data to the correc…

content/globals/cookie_panel.yaml

@@ -1,77 +1 @@
 title: 'Cookie Panel'
-data:
-  button_text: Cookies
-  introduction: '<h2>Our use of cookies</h2><p>Some cookies are necessary for us to manage how our website behaves while other optional, or non-necessary, cookies help us to analyse website usage. You can Accept All or Reject All optional cookies or control individual cookie types below.</p><p>You can read more in our Cookie Notice</p>'
-  cookie_groups:
-    -
-      id: xzPoz9zg
-      title: Functional
-      description: 'These cookies enable core functionality such as security, network management, and accessibility. You may disable these by changing your browser settings, but this may affect how the website functions.'
-      show_toggle: false
-      type: new_set
-      enabled: true
-      slug: functional
-    -
-      id: LCjOM4qU
-      title: 'Analytics cookies'
-      description: 'Analytical cookies help us to improve our website by collecting and reporting information on its usage.'
-      show_toggle: true
-      type: new_set
-      enabled: true
-      slug: analytics
-    -
-      id: Rd9AbvBa
-      title: 'Third-Party Cookies'
-      description: 'These cookies are set by a website other than the website you are visiting usually as a result of some embedded content such as a video, a social media share or a like button or a contact map.'
-      show_toggle: true
-      type: new_set
-      enabled: true
-      slug: third-party
-    -
-      id: mckkbrg6
-      title: 'Advertising Cookies'
-      slug: advertising
-      description: 'These cookies are set by a website other than the website you are visiting to enable personalisation of advertising preferences across ad networks.'
-      show_toggle: true
-      type: new_set
-      enabled: true
-  cookie_table:
-    -
-      id: kFjZnXh7
-      title: 'Functional cookies'
-      cookie:
-        -
-          id: 6sG2hUTA
-          name: session
-          length: '2 days'
-          purpose: 'Handle session related activity'
-          type: new_set
-          enabled: true
-      type: new_set
-      enabled: true
-    -
-      id: UV03y2CT
-      title: 'Analytics cookies'
-      cookie:
-        -
-          id: HH7KdSZ7
-          name: 'Google Analytics'
-          length: '7 days'
-          purpose: 'Allow tracking of website usage'
-          type: new_set
-          enabled: true
-      type: new_set
-      enabled: true
-    -
-      id: 90OlDt36
-      title: 'Third-Party Cookies'
-      cookie:
-        -
-          id: vSFhxKfw
-          name: 'Facebook pixel'
-          length: '7 days'
-          purpose: 'Tracks your usage and associates it with your Facebook account'
-          type: new_set
-          enabled: true
-      type: new_set
-      enabled: true

content/globals/default/cookie_panel.yaml

@@ -0,0 +1,75 @@
+button_text: Cookies
+introduction: '<h2>Our use of cookies</h2><p>Some cookies are necessary for us to manage how our website behaves while other optional, or non-necessary, cookies help us to analyse website usage. You can Accept All or Reject All optional cookies or control individual cookie types below.</p><p>You can read more in our Cookie Notice</p>'
+cookie_groups:
+  -
+    id: xzPoz9zg
+    title: Functional
+    description: 'These cookies enable core functionality such as security, network management, and accessibility. You may disable these by changing your browser settings, but this may affect how the website functions.'
+    show_toggle: false
+    type: new_set
+    enabled: true
+    slug: functional
+  -
+    id: LCjOM4qU
+    title: 'Analytics cookies'
+    description: 'Analytical cookies help us to improve our website by collecting and reporting information on its usage.'
+    show_toggle: true
+    type: new_set
+    enabled: true
+    slug: analytics
+  -
+    id: Rd9AbvBa
+    title: 'Third-Party Cookies'
+    description: 'These cookies are set by a website other than the website you are visiting usually as a result of some embedded content such as a video, a social media share or a like button or a contact map.'
+    show_toggle: true
+    type: new_set
+    enabled: true
+    slug: third-party
+  -
+    id: mckkbrg6
+    title: 'Advertising Cookies'
+    slug: advertising
+    description: 'These cookies are set by a website other than the website you are visiting to enable personalisation of advertising preferences across ad networks.'
+    show_toggle: true
+    type: new_set
+    enabled: true
+cookie_table:
+  -
+    id: kFjZnXh7
+    title: 'Functional cookies'
+    cookie:
+      -
+        id: 6sG2hUTA
+        name: session
+        length: '2 days'
+        purpose: 'Handle session related activity'
+        type: new_set
+        enabled: true
+    type: new_set
+    enabled: true
+  -
+    id: UV03y2CT
+    title: 'Analytics cookies'
+    cookie:
+      -
+        id: HH7KdSZ7
+        name: 'Google Analytics'
+        length: '7 days'
+        purpose: 'Allow tracking of website usage'
+        type: new_set
+        enabled: true
+    type: new_set
+    enabled: true
+  -
+    id: 90OlDt36
+    title: 'Third-Party Cookies'
+    cookie:
+      -
+        id: vSFhxKfw
+        name: 'Facebook pixel'
+        length: '7 days'
+        purpose: 'Tracks your usage and associates it with your Facebook account'
+        type: new_set
+        enabled: true
+    type: new_set
+    enabled: true

resources/blueprints/globals/analytics.yaml

@@ -1,12 +1,12 @@
 tabs:
-main:
-  display: Main
-  sections:
-    -
-      display: Google
-      fields:
-        -
-          handle: tag_manager_id
-          field:
-            type: text
-            display: 'Tag Manager ID'
+  main:
+    display: Main
+    sections:
+      -
+        display: Google
+        fields:
+          -
+            handle: tag_manager_id
+            field:
+              type: text
+              display: 'Tag Manager ID'