Merge branch 'master' of figureslibres.io:bachir/popsu-d9

.gitattributes

@@ -19,24 +19,24 @@
 *.config  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.dist    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
-*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.js      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.po      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.script  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.sql     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.svg     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.twig    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.txt     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

composer.json

@@ -69,7 +69,8 @@
             "cweagans/composer-patches": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "php-http/discovery": true
         }
     },
     "extra": {
@@ -150,10 +151,10 @@
               "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"
+              "add cartodb maps to leaflet_more_maps https://www.drupal.org/project/leaflet_more_maps/issues/3231159": "./patches/leaflet_more_maps_cartodb-2.1.3.patch"
           },
           "drupal/ctools": {
-              "How to manually pass an argument to a views block through interface https://www.drupal.org/project/ctools/issues/2759445": "https://www.drupal.org/files/issues/2022-05-22/2759445-86.patch"
+              "How to manually pass an argument to a views block through interface https://www.drupal.org/project/ctools/issues/2759445": "https://www.drupal.org/files/issues/2023-01-18/2759445-100.patch"
           }
         }
     }

config/sync/autologout.settings.yml

@@ -14,3 +14,7 @@ jstimer_format: '%hours%:%mins%:%secs%'
 jstimer_js_load_option: false
 use_alt_logout_method: false
 use_watchdog: true
+enabled: true
+whitelisted_ip_addresses: ''
+inactivity_message_type: status
+modal_width: 450

config/sync/email_registration.settings.yml

@@ -2,3 +2,4 @@ _core:
   default_config_hash: k024s6lEcCjGqAq_82KNi-RRCCc37Jxo5frFNChAqao
 langcode: fr
 login_with_username: false
+require_username_on_registration: false

config/sync/views.view.projets.yml

@@ -780,6 +780,9 @@ display:
             control: true
             options: '{"spiderfyOnMaxZoom":true,"showCoverageOnHover":true,"removeOutsideVisibleBounds":false}'
             include_path: false
+          fullscreen:
+            control: false
+            options: '{"position":"topleft","pseudoFullscreen":false}'
           path: '{"color":"#3388ff","opacity":"1.0","stroke":true,"weight":3,"fill":"depends","fillColor":"*","fillOpacity":"0.2","radius":"6"}'
           geocoder:
             control: false
@@ -795,7 +798,6 @@ display:
               zoom: 16
               popup: false
               options: ''
-          fullscreen_control: false
       row:
         type: fields
       query:

patches/leaflet_more_maps_cartodb-2.1.3.patch

@@ -0,0 +1,43 @@
+diff --git a/leaflet_more_maps.module b/leaflet_more_maps.module
+index cce4c86..33e9a60 100644
+--- a/leaflet_more_maps.module
++++ b/leaflet_more_maps.module
+@@ -556,6 +556,38 @@ function _leaflet_more_maps_assemble_default_map_info(array &$map_info, array $d
+     ],
+   ];
+ 
++
++  // cartodb
++  $attr_cartodb = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>';
++  $cartodb_names = [
++    'light_all',
++    'light_nolabels',
++    'light_only_labels',
++    'dark_all',
++    'dark_nolabels',
++    'dark_only_labels',
++    'rastertiles/voyager',
++    'rastertiles/voyager_nolabels',
++    'rastertiles/voyager_only_labels',
++    'rastertiles/voyager_labels_under'
++  ];
++  foreach ($cartodb_names as $cartodb_name) {
++    $code = mb_strtolower($cartodb_name);
++    $label = t('Cartodb @name', ['@name' => $cartodb_name]);
++    $url_template = "https://{s}.basemaps.cartocdn.com/$code/{z}/{x}/{y}{r}.png";
++    $map_info["cartodb-$code"] = [
++      'label' => $label,
++      'description' => $label,
++      'settings' => $default_settings,
++      'layers' => [
++        '' => [
++          'urlTemplate' => $url_template,
++          'options' => ['attribution' => $attr_cartodb],
++        ]
++      ]
++    ];
++  }
++  
+   // Add hook to change default list of maps.
+   // Let other modules alter the default map info.
+   \Drupal::moduleHandler()->invokeAll('leaflet_more_maps_list_alter', array(&$map_info));