Merge branch 'release/3.6.0'

statikbe · Jan 2, 2024 · ffe3dbb · ffe3dbb
2 parents 8a0ef37 + ce52cca
commit ffe3dbb
Show file tree

Hide file tree

Showing 57 changed files with 408 additions and 335 deletions.
diff --git a/config/project/entryTypes/accessibilityStatement--c113b5bd-7822-4e56-933c-ed2a6ae65111.yaml b/config/project/entryTypes/accessibilityStatement--c113b5bd-7822-4e56-933c-ed2a6ae65111.yaml
@@ -78,7 +78,7 @@ fieldLayouts:
 handle: accessibilityStatement
 hasTitleField: true
 name: 'Accessibility Statement'
-section: 99a435d2-9c12-4ef6-8b3b-2a9915d4216b # Accessibility Statement
+section: 99a435d2-9c12-4ef6-8b3b-2a9915d4216b
 showStatusField: true
 slugTranslationKeyFormat: null
 slugTranslationMethod: site

diff --git a/config/project/entryTypes/news--109f5d44-e366-49e7-826d-6b13de779861.yaml b/config/project/entryTypes/news--109f5d44-e366-49e7-826d-6b13de779861.yaml
@@ -167,7 +167,7 @@ fieldLayouts:
 handle: news
 hasTitleField: true
 name: News
-section: c576870d-abd8-46aa-8fe5-cdd12c40dfa8 # News
+section: c576870d-abd8-46aa-8fe5-cdd12c40dfa8 # News items
 showStatusField: true
 slugTranslationKeyFormat: null
 slugTranslationMethod: site

diff --git a/config/project/fields/imageCaption--39f07216-d49a-4917-b05e-bec26f425843.yaml b/config/project/fields/imageCaption--39f07216-d49a-4917-b05e-bec26f425843.yaml
@@ -2,17 +2,17 @@ columnSuffix: null
 contentColumnType: text
 fieldGroup: 2c770290-8edc-4f26-b846-6d99d36d7844 # Common
 handle: imageCaption
-instructions: ''
+instructions: 'This will most likely be visible below the image'
 name: 'Image Caption'
 searchable: true
 settings:
   byteLimit: null
   charLimit: null
-  code: ''
+  code: false
   columnType: text
-  initialRows: '4'
-  multiline: ''
-  placeholder: 'description of the image'
+  initialRows: 4
+  multiline: false
+  placeholder: null
   uiMode: normal
 translationKeyFormat: null
 translationMethod: site

diff --git a/config/project/fields/imageCopyright--bcf87482-b5f3-4be6-9a63-153f0458466b.yaml b/config/project/fields/imageCopyright--bcf87482-b5f3-4be6-9a63-153f0458466b.yaml
@@ -2,17 +2,17 @@ columnSuffix: null
 contentColumnType: text
 fieldGroup: 2c770290-8edc-4f26-b846-6d99d36d7844 # Common
 handle: imageCopyright
-instructions: ''
+instructions: 'Credit of the image'
 name: 'Image Copyright'
 searchable: true
 settings:
   byteLimit: null
   charLimit: null
-  code: ''
+  code: false
   columnType: null
-  initialRows: '4'
-  multiline: ''
-  placeholder: 'Credit of the image'
+  initialRows: 4
+  multiline: false
+  placeholder: null
   uiMode: normal
 translationKeyFormat: null
 translationMethod: site

diff --git a/config/project/matrixBlockTypes/callToAction--7b5ab248-6255-4b42-88bc-80c1dee62b20.yaml b/config/project/matrixBlockTypes/callToAction--7b5ab248-6255-4b42-88bc-80c1dee62b20.yaml
@@ -131,12 +131,13 @@ fields:
       availableVolumes: '*'
       ckeConfig: 131a4f6d-f00f-4238-b846-dd504bf669fe # Simple
       columnType: text
-      defaultTransform: ''
+      defaultTransform: null
       enableSourceEditingForNonAdmins: false
       purifierConfig: null
       purifyHtml: true
       showUnpermittedFiles: false
       showUnpermittedVolumes: false
+      showWordCount: false
     translationKeyFormat: null
     translationMethod: site
     type: craft\ckeditor\Field

diff --git a/config/project/matrixBlockTypes/customTable--f2d33237-c7de-4590-9683-7efe6594ebbd.yaml b/config/project/matrixBlockTypes/customTable--f2d33237-c7de-4590-9683-7efe6594ebbd.yaml
@@ -46,12 +46,13 @@ fields:
       availableVolumes: '*'
       ckeConfig: 5dbe5a67-b60b-4529-a095-facb9b24a39b # Table
       columnType: text
-      defaultTransform: ''
+      defaultTransform: null
       enableSourceEditingForNonAdmins: false
       purifierConfig: null
       purifyHtml: true
       showUnpermittedFiles: false
       showUnpermittedVolumes: false
+      showWordCount: false
     translationKeyFormat: null
     translationMethod: site
     type: craft\ckeditor\Field

diff --git a/config/project/matrixBlockTypes/form--f3211a4e-d5f8-4514-a372-c5b8cfc2c44a.yaml b/config/project/matrixBlockTypes/form--f3211a4e-d5f8-4514-a372-c5b8cfc2c44a.yaml
@@ -70,12 +70,13 @@ fields:
       availableVolumes: '*'
       ckeConfig: 7d23b02c-ad1d-44a8-9751-35fbdcc38963 # Standard
       columnType: text
-      defaultTransform: ''
+      defaultTransform: null
       enableSourceEditingForNonAdmins: false
       purifierConfig: null
       purifyHtml: true
       showUnpermittedFiles: false
       showUnpermittedVolumes: false
+      showWordCount: false
     translationKeyFormat: null
     translationMethod: site
     type: craft\ckeditor\Field

diff --git a/config/project/matrixBlockTypes/table--1acc740f-9a8e-481e-bb27-7fa09f56deae.yaml b/config/project/matrixBlockTypes/table--1acc740f-9a8e-481e-bb27-7fa09f56deae.yaml
diff --git a/config/project/matrixBlockTypes/textTwoColumns--1e4267e1-8d5f-4312-8458-86b19bc17d74.yaml b/config/project/matrixBlockTypes/textTwoColumns--1e4267e1-8d5f-4312-8458-86b19bc17d74.yaml
@@ -2628,12 +2628,13 @@ fields:
       availableVolumes: '*'
       ckeConfig: 25f93ead-d3f6-4049-ba98-6378754f4289 # Extended
       columnType: text
-      defaultTransform: ''
+      defaultTransform: null
       enableSourceEditingForNonAdmins: false
       purifierConfig: null
       purifyHtml: true
       showUnpermittedFiles: false
       showUnpermittedVolumes: false
+      showWordCount: false
     translationKeyFormat: null
     translationMethod: site
     type: craft\ckeditor\Field
@@ -2650,12 +2651,13 @@ fields:
       availableVolumes: '*'
       ckeConfig: 25f93ead-d3f6-4049-ba98-6378754f4289 # Extended
       columnType: text
-      defaultTransform: ''
+      defaultTransform: null
       enableSourceEditingForNonAdmins: false
       purifierConfig: null
       purifyHtml: true
       showUnpermittedFiles: false
       showUnpermittedVolumes: false
+      showWordCount: false
     translationKeyFormat: null
     translationMethod: site
     type: craft\ckeditor\Field

diff --git a/config/project/project.yaml b/config/project/project.yaml
@@ -1,4 +1,5 @@
-dateModified: 1700754242
+dateModified: 1701445619
+
 elementSources:
   craft\elements\Entry:
     -
@@ -57,7 +58,7 @@ elementSources:
       type: native
     -
       disabled: false
-      key: 'section:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News
+      key: 'section:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
       tableAttributes:
         - slug
         - revisionCreator
@@ -237,9 +238,10 @@ meta:
   __names__:
     1a64e732-f1ae-44b6-aee3-bedc6b1ebdd2: 'Cookie policy' # Cookie policy
     1a9703c9-1eb8-4b3a-94e1-1386e5b24f2a: Title # Title
-    1acc740f-9a8e-481e-bb27-7fa09f56deae: Table # Table
     1c4e3f0f-ca9b-474d-a460-48f45133c763: 'Forgot password' # Forgot password
     1e4267e1-8d5f-4312-8458-86b19bc17d74: 'Text (2 columns)' # Text (2 columns)
+    01faae48-e031-4496-af0c-89de7f12eccd: 'News categories' # News categories
+    2a768305-5971-43c0-a2f4-415e648c6a45: Default # Default
     2c770290-8edc-4f26-b846-6d99d36d7844: Common # Common
     2e4b3bb0-26e4-47d2-9445-54401a221c63: 'X (Twitter)' # X (Twitter)
     2f8a6ddc-4ab7-4f9f-a2ea-72c6cb387f38: 'Overview description' # Overview description
@@ -258,6 +260,7 @@ meta:
     6ca94949-c3f4-465d-88c7-3d4736d97ed4: Address # Address
     6d99d3e8-e687-44e6-9e4f-8724da1c5123: Link # Link
     6de046f0-6167-4af1-aa91-ffaf83e36a14: NL # NL
+    6f79e12f-9d80-4f17-ae51-5160127975ec: 'Site Settings' # Site Settings
     7b5ab248-6255-4b42-88bc-80c1dee62b20: 'Call To Action' # Call To Action
     7bfca6b9-10b5-45cf-a470-29d85f876c61: 'Background Color' # Background Color
     7d23b02c-ad1d-44a8-9751-35fbdcc38963: Standard # Standard
@@ -290,6 +293,7 @@ meta:
     61cbb04c-ab3f-421e-bb8f-9e81ecc0da41: Site # Site
     71a7d521-3217-4254-8b3f-f778279d342c: Title # Title
     74a30650-eb90-462f-a104-de1d41ac8221: Form # Form
+    75c71ec6-7c59-460d-bac3-80ae2ee887a5: 'Site Settings' # Site Settings
     82edb6db-a497-4e37-8c25-5d4d210f0c81: 'Search keywords' # Search keywords
     84a6a70f-85ce-43a5-ad74-738a0cbea388: 'CTA Column 2' # CTA Column 2
     89c47888-bddf-4633-9352-1d5dc3bb452f: Home # Home
@@ -310,7 +314,6 @@ meta:
     933f619e-82e4-4b3d-a27f-9d7d9cce42b8: Text # Text
     979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca: 'Public Files' # Public Files
     2184d090-d3e1-413b-8d21-b537c5141ef8: Image # Image
-    02482f0b-2650-4903-acb3-f24ea73b95a8: Table # Table
     2561c4fb-34b5-49e6-ade6-f774411e48ba: Video # Video
     3196b984-5af4-44dd-a6db-ac2c8f7924d9: 'Content Managers' # Content Managers
     03498d1a-eb01-4cb2-9e2b-623015ed0d85: 'Link Style' # Link Style
@@ -330,7 +333,6 @@ meta:
     64516e7d-b46e-44ff-aa53-34e7e1e0a89d: Default # Default
     072209d1-1c68-4ee5-9a66-a209b518da6d: Mail # Mail
     83568fdb-b819-4743-9c0a-c1a432b36feb: Login # Login
-    97526b7c-2621-489c-a79d-9fdc9dce790a: Title # Title
     197566c6-94bb-4e67-86d7-8945f2589a1d: 'Optimized Hero' # Optimized Hero
     209777db-293c-48b6-9897-1fe97b278510: Video # Video
     685530fc-e1f1-4be1-813b-ebf9ac3aa108: SEO # SEO
@@ -364,7 +366,7 @@ meta:
     c74db584-8982-4131-acaf-8448f5d1af9b: 'Forgot Password Confirmation' # Forgot Password Confirmation
     c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e: 'Privacy policy' # Privacy policy
     c8533e19-1c6c-4d33-8e50-71babb409313: 'Video position' # Video position
-    c576870d-abd8-46aa-8fe5-cdd12c40dfa8: News # News
+    c576870d-abd8-46aa-8fe5-cdd12c40dfa8: 'News items' # News items
     ca8bb389-d0f3-4dbb-af40-e2f6ef211040: 'Call to action' # Call to action
     cd736fb3-c9b7-4ce1-88a8-da8b64249eb1: Image # Image
     ce1fab3c-0b02-49d8-8d8f-1bab2d7c05e2: LinkedIn # LinkedIn

diff --git a/config/project/users/groups/contentManagers--3196b984-5af4-44dd-a6db-ac2c8f7924d9.yaml b/config/project/users/groups/contentManagers--3196b984-5af4-44dd-a6db-ac2c8f7924d9.yaml
@@ -13,11 +13,11 @@ permissions:
   - 'createentries:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'createfolders:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
   - 'deleteassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'deletecategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'deletecategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'deleteentries:45b7c78f-587d-441b-bbd1-605ca629d0bd' # Pages
   - 'deleteentries:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'deletepeerassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'deletepeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'deletepeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'deletepeerentries:45b7c78f-587d-441b-bbd1-605ca629d0bd' # Pages
   - 'deletepeerentries:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'deletepeerentrydrafts:05aba0e3-e1de-4bf3-8a07-5c9f3ef9475c' # Edit profile
@@ -33,17 +33,17 @@ permissions:
   - 'deletepeerentrydrafts:5d236e94-b6a8-472c-9296-a5c992cdd49a' # Contact
   - 'deletepeerentrydrafts:684ece64-c23a-4abf-9574-f2c053d496e8' # Register
   - 'deletepeerentrydrafts:8e583282-1fec-4444-822f-37b2d5961f28' # Set Password
-  - 'deletepeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b' # Accessibility Statement
+  - 'deletepeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b'
   - 'deletepeerentrydrafts:af69e9a2-96df-4fa9-8cc3-2728ec4fc632' # Edit password
   - 'deletepeerentrydrafts:c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e' # Privacy policy
   - 'deletepeerentrydrafts:c25b1e19-dca6-4ab5-a776-a043f6ee4c82' # Login
   - 'deletepeerentrydrafts:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'deletepeerentrydrafts:d5601a1f-a33e-4c5a-b7af-1f29347149ca' # Registration completed
   - 'deletepeerentrydrafts:dca2ac05-7833-41de-b7b4-a737c090575c' # Confirm your account
   - 'deletepeerentrydrafts:e3bed4e1-82ae-45e8-908c-0a6669141b31' # Search results
-  - 'editglobalset:10fdc148-c0a4-486b-a5d1-3d36f2862352'
-  - 'editglobalset:4666d048-0521-4d0f-9a4a-208e6182fb85'
-  - 'editglobalset:62533b8e-b5bf-4ff0-a0c9-c45bfc8cc5fd'
+  - 'editglobalset:10fdc148-c0a4-486b-a5d1-3d36f2862352' # Social Media
+  - 'editglobalset:4666d048-0521-4d0f-9a4a-208e6182fb85' # Fallback
+  - 'editglobalset:62533b8e-b5bf-4ff0-a0c9-c45bfc8cc5fd' # General Info
   - 'editimages:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
   - 'editpeerimages:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
   - 'editsite:6de046f0-6167-4af1-aa91-ffaf83e36a14' # NL
@@ -65,7 +65,7 @@ permissions:
   - 'replacefiles:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
   - 'replacepeerfiles:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
   - 'saveassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'savecategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'savecategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'saveentries:05aba0e3-e1de-4bf3-8a07-5c9f3ef9475c' # Edit profile
   - 'saveentries:1c4e3f0f-ca9b-474d-a460-48f45133c763' # Forgot password
   - 'saveentries:361daec5-5ea3-4d9f-957f-f39c78bb595e' # Profile
@@ -79,7 +79,7 @@ permissions:
   - 'saveentries:5d236e94-b6a8-472c-9296-a5c992cdd49a' # Contact
   - 'saveentries:684ece64-c23a-4abf-9574-f2c053d496e8' # Register
   - 'saveentries:8e583282-1fec-4444-822f-37b2d5961f28' # Set Password
-  - 'saveentries:99a435d2-9c12-4ef6-8b3b-2a9915d4216b' # Accessibility Statement
+  - 'saveentries:99a435d2-9c12-4ef6-8b3b-2a9915d4216b'
   - 'saveentries:af69e9a2-96df-4fa9-8cc3-2728ec4fc632' # Edit password
   - 'saveentries:c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e' # Privacy policy
   - 'saveentries:c25b1e19-dca6-4ab5-a776-a043f6ee4c82' # Login
@@ -88,7 +88,7 @@ permissions:
   - 'saveentries:dca2ac05-7833-41de-b7b4-a737c090575c' # Confirm your account
   - 'saveentries:e3bed4e1-82ae-45e8-908c-0a6669141b31' # Search results
   - 'savepeerassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'savepeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'savepeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'savepeerentries:45b7c78f-587d-441b-bbd1-605ca629d0bd' # Pages
   - 'savepeerentries:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'savepeerentrydrafts:05aba0e3-e1de-4bf3-8a07-5c9f3ef9475c' # Edit profile
@@ -104,7 +104,7 @@ permissions:
   - 'savepeerentrydrafts:5d236e94-b6a8-472c-9296-a5c992cdd49a' # Contact
   - 'savepeerentrydrafts:684ece64-c23a-4abf-9574-f2c053d496e8' # Register
   - 'savepeerentrydrafts:8e583282-1fec-4444-822f-37b2d5961f28' # Set Password
-  - 'savepeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b' # Accessibility Statement
+  - 'savepeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b'
   - 'savepeerentrydrafts:af69e9a2-96df-4fa9-8cc3-2728ec4fc632' # Edit password
   - 'savepeerentrydrafts:c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e' # Privacy policy
   - 'savepeerentrydrafts:c25b1e19-dca6-4ab5-a776-a043f6ee4c82' # Login
@@ -115,7 +115,7 @@ permissions:
   - 'seo-fields:notfound'
   - 'seo-fields:redirects'
   - 'viewassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'viewcategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'viewcategories:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'viewentries:05aba0e3-e1de-4bf3-8a07-5c9f3ef9475c' # Edit profile
   - 'viewentries:1c4e3f0f-ca9b-474d-a460-48f45133c763' # Forgot password
   - 'viewentries:361daec5-5ea3-4d9f-957f-f39c78bb595e' # Profile
@@ -129,7 +129,7 @@ permissions:
   - 'viewentries:5d236e94-b6a8-472c-9296-a5c992cdd49a' # Contact
   - 'viewentries:684ece64-c23a-4abf-9574-f2c053d496e8' # Register
   - 'viewentries:8e583282-1fec-4444-822f-37b2d5961f28' # Set Password
-  - 'viewentries:99a435d2-9c12-4ef6-8b3b-2a9915d4216b' # Accessibility Statement
+  - 'viewentries:99a435d2-9c12-4ef6-8b3b-2a9915d4216b'
   - 'viewentries:af69e9a2-96df-4fa9-8cc3-2728ec4fc632' # Edit password
   - 'viewentries:c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e' # Privacy policy
   - 'viewentries:c25b1e19-dca6-4ab5-a776-a043f6ee4c82' # Login
@@ -138,7 +138,7 @@ permissions:
   - 'viewentries:dca2ac05-7833-41de-b7b4-a737c090575c' # Confirm your account
   - 'viewentries:e3bed4e1-82ae-45e8-908c-0a6669141b31' # Search results
   - 'viewpeerassets:979c3eeb-f99a-4ca1-bcbe-ce9298a4e4ca' # Public Files
-  - 'viewpeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d'
+  - 'viewpeercategorydrafts:64516e7d-b46e-44ff-aa53-34e7e1e0a89d' # Default
   - 'viewpeerentries:45b7c78f-587d-441b-bbd1-605ca629d0bd' # Pages
   - 'viewpeerentries:c576870d-abd8-46aa-8fe5-cdd12c40dfa8' # News items
   - 'viewpeerentrydrafts:05aba0e3-e1de-4bf3-8a07-5c9f3ef9475c' # Edit profile
@@ -154,7 +154,7 @@ permissions:
   - 'viewpeerentrydrafts:5d236e94-b6a8-472c-9296-a5c992cdd49a' # Contact
   - 'viewpeerentrydrafts:684ece64-c23a-4abf-9574-f2c053d496e8' # Register
   - 'viewpeerentrydrafts:8e583282-1fec-4444-822f-37b2d5961f28' # Set Password
-  - 'viewpeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b' # Accessibility Statement
+  - 'viewpeerentrydrafts:99a435d2-9c12-4ef6-8b3b-2a9915d4216b'
   - 'viewpeerentrydrafts:af69e9a2-96df-4fa9-8cc3-2728ec4fc632' # Edit password
   - 'viewpeerentrydrafts:c2198cbb-f6e1-478a-ab4a-bbbaea43ce0e' # Privacy policy
   - 'viewpeerentrydrafts:c25b1e19-dca6-4ab5-a776-a043f6ee4c82' # Login