From a73c616ee08d21f17ba05ae5feeded83681dfa91 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Thu, 2 Sep 2021 23:17:31 +0200
Subject: [PATCH] updated core and contrib modules, added cartodb maps to
 leaflet_more_maps

---
 composer.json                                   | 3 +++
 composer.lock                                   | 2 +-
 config/sync/matomo.settings.yml                 | 8 +++++++-
 config/sync/views.view.content_translations.yml | 4 +++-
 config/sync/views.view.projets.yml              | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index c3482879..7c238cd1 100644
--- a/composer.json
+++ b/composer.json
@@ -132,6 +132,9 @@
           },
           "drupal/paragraphs": {
               "Skip saving empty paragraphs for certain types https://www.drupal.org/project/paragraphs/issues/2877695" : "https://www.drupal.org/files/issues/2021-03-31/2877695-35.patch"
+          },
+          "drupal/leaflet_more_maps": {
+              "add cartodb maps to leaflet_more_maps": "./patches/leaflet_more_maps_cartodb.patch"
           }
         }
     }
diff --git a/composer.lock b/composer.lock
index efcface1..4c12394b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -15730,5 +15730,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/config/sync/matomo.settings.yml b/config/sync/matomo.settings.yml
index f11eeda0..8165df63 100644
--- a/config/sync/matomo.settings.yml
+++ b/config/sync/matomo.settings.yml
@@ -4,7 +4,13 @@ url_https: ''
 domain_mode: 0
 visibility:
   request_path_mode: 0
-  request_path_pages: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/user/*/*"
+  request_path_pages: |-
+    /admin
+    /admin/*
+    /batch
+    /node/add*
+    /node/*/*
+    /user/*/*
   user_role_mode: 0
   user_role_roles: {  }
   user_account_mode: 1
diff --git a/config/sync/views.view.content_translations.yml b/config/sync/views.view.content_translations.yml
index a5d5d836..08c8a98b 100644
--- a/config/sync/views.view.content_translations.yml
+++ b/config/sync/views.view.content_translations.yml
@@ -365,7 +365,9 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<span class=\"status\">{{ translation_status }}</span>\n{% if translation_outdated  %} <span class=\"marker\">{{ 'outdated'|t }}</span>{% endif %}"
+            text: |-
+              <span class="status">{{ translation_status }}</span>
+              {% if translation_outdated  %} <span class="marker">{{ 'outdated'|t }}</span>{% endif %}
             make_link: false
             path: ''
             absolute: false
diff --git a/config/sync/views.view.projets.yml b/config/sync/views.view.projets.yml
index 3ee69534..dc65123d 100644
--- a/config/sync/views.view.projets.yml
+++ b/config/sync/views.view.projets.yml
@@ -66,7 +66,7 @@ display:
           name_field: title
           description_field: '#rendered_view_fields'
           view_mode: full
-          leaflet_map: '~popsu home'
+          leaflet_map: cartodb-light_nolabels
           height: '800'
           height_unit: px
           hide_empty_map: false