Merge branch 'master' of gitea-figureslibres.io:bachir/drupal-quartiersdedemain

config/sync/core.base_field_override.node.actualite.menu_link.yml

@@ -11,7 +11,7 @@ bundle: actualite
 label: 'Menu link'
 description: 'Computed menu link for the node (only available during node saving).'
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:

config/sync/core.base_field_override.node.actualite.metatag.yml

@@ -13,7 +13,7 @@ bundle: actualite
 label: 'Metatags (Hidden field for JSON support)'
 description: 'The computed meta tags for the entity.'
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings: {  }

config/sync/core.base_field_override.node.actualite.title.yml

@@ -11,7 +11,7 @@ bundle: actualite
 label: Title
 description: ''
 required: true
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings: {  }

config/sync/field.field.node.actualite.body.yml

@@ -14,7 +14,7 @@ bundle: actualite
 label: Body
 description: ''
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:

config/sync/field.field.node.actualite.field_fichiers.yml

@@ -14,7 +14,7 @@ bundle: actualite
 label: Fichiers
 description: ''
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:

config/sync/field.field.node.actualite.field_images.yml

@@ -6,7 +6,14 @@ dependencies:
     - field.storage.node.field_images
     - node.type.actualite
   module:
+    - content_translation
     - image
+third_party_settings:
+  content_translation:
+    translation_sync:
+      alt: alt
+      title: title
+      file: '0'
 id: node.actualite.field_images
 field_name: field_images
 entity_type: node
@@ -14,7 +21,7 @@ bundle: actualite
 label: Images
 description: ''
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:

config/sync/field.field.node.actualite.field_liens.yml

@@ -14,7 +14,7 @@ bundle: actualite
 label: Liens
 description: ''
 required: false
-translatable: false
+translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:

config/sync/language.content_settings.node.actualite.yml

@@ -8,7 +8,7 @@ dependencies:
     - content_translation
 third_party_settings:
   content_translation:
-    enabled: false
+    enabled: true
     bundle_settings:
       untranslatable_fields_hide: '0'
 id: node.actualite

config/sync/language/en/field.field.node.site.field_departement_s.yml

@@ -0,0 +1 @@
+description: Department(s)

config/sync/language/en/field.field.node.site.field_nom_de_la_commune_nb_d_hab.yml

@@ -0,0 +1 @@
+label: 'Name of the municipality (population)'

config/sync/language/en/field.field.node.site.field_nom_du_qpv_nb_d_hab.yml

@@ -0,0 +1 @@
+label: 'Name of the priority urban neighborhood (population)'

config/sync/language/en/field.field.node.site.field_porteur_s_de_site.yml

@@ -0,0 +1 @@
+label: 'Contracting authority'

config/sync/language/en/field.field.node.site.field_programme_de_l_etat.yml

@@ -0,0 +1 @@
+description: 'State programmes'

config/sync/language/en/field.field.node.site.field_region.yml

@@ -0,0 +1 @@
+label: Region(s)

config/sync/language/en/views.view.actus.yml

@@ -0,0 +1,4 @@
+display:
+  default:
+    display_options:
+      title: Actualities

config/sync/views.view.actus.yml

@@ -144,7 +144,7 @@ display:
         options:
           query_comment: ''
           disable_sql_rewrite: false
-          distinct: false
+          distinct: true
           replica: false
           query_tags: {  }
       relationships: {  }

web/modules/custom/q2d_mod/src/Plugin/Block/SitesMap.php

@@ -21,6 +21,8 @@ class SitesMap extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
+    $language = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
     $return = null;
 
     $allSites = \Drupal::entityTypeManager()->getStorage('node')
@@ -39,12 +41,14 @@ class SitesMap extends BlockBase {
 
 
     foreach($allSites as $index => $site){
-      $title = $site->get('title')->getString();
+      // $title = $site->get('title')->getString();
-      $subtitle = $site->get('field_sous_titre')->getString();
+      $title = $site->hasTranslation($language) ? $site->getTranslation($language)->get('title')->getString() : $site->get('title')->getString();
+      // $subtitle = $site->get('field_sous_titre')->getString();
+      $subtitle = $site->hasTranslation($language) ? $site->getTranslation($language)->get('field_sous_titre')->getString() : $site->get('field_sous_titre')->getString();
 
       $link_options = ['absolute' => TRUE, 'attributes' => ['class' => 'site-link']]; // Passer 'absolute' à TRUE
       $site_url = $site->toUrl('canonical', $link_options)->toString(); // URL absolue pour le data-url
-      $site_link_object = Link::createFromRoute("voir le site", 'entity.node.canonical', ['node' => $site->id()], $link_options);
+      $site_link_object = Link::createFromRoute(t("got to site"), 'entity.node.canonical', ['node' => $site->id()], $link_options);
       $link = $site_link_object->toString()->getGeneratedLink();
 
       $datacontent = htmlspecialchars("<strong>$title</strong><br>$subtitle<br>$link");

web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css

@@ -255,6 +255,33 @@ header {
   top: 0;
   transition: none;
 }
+header .language-switcher-language-url {
+  text-transform: uppercase;
+  color: white;
+}
+header .language-switcher-language-url ul {
+  display: flex;
+  flex-direction: row;
+  font-size: 0.6rem;
+  padding: 0;
+  width: fit-content;
+}
+@media (max-width: 810px) {
+  header .language-switcher-language-url ul {
+    font-size: 0.9rem;
+  }
+}
+header .language-switcher-language-url ul li a {
+  color: white;
+  font-family: "gilroy-light";
+}
+header .language-switcher-language-url ul li:nth-child(1)::after {
+  content: " / ";
+  white-space: pre;
+}
+header .language-switcher-language-url ul .is-active {
+  font-family: "gilroy-bold";
+}
 @media (max-width: 810px) {
   header {
     height: 100vh;
@@ -401,6 +428,11 @@ header .header_nav_container {
   transition: transform 0.3s ease-in-out;
   z-index: -1;
 }
+@media (max-width: 1090px) {
+  header .header_nav_container {
+    height: fit-content;
+  }
+}
 @media (max-width: 500px) {
   header .header_nav_container {
     flex: 0 0 40%;
@@ -457,6 +489,10 @@ header .header_nav_container #block-quartiers-de-demain-entete ul li:not(:last-o
   padding-bottom: 0.3rem;
   width: 60%; /* Réduit la largeur du soulignement à 50% */
 }
+header .header_nav_container #block-quartiers-de-demain-selecteurdelangue {
+  width: fit-content;
+  margin: auto;
+}
 header .header_nav_container.hidden {
   transform: translateX(30%);
 }
@@ -2672,6 +2708,12 @@ body {
   grid-column: 2;
   grid-row: 2;
 }
+#consultation .layout-content .content_container .node-type-static #paragraph-id--11 .colone-picto p:nth-of-type(3) {
+  grid-column: 1/span 2;
+  grid-row: 3;
+  font-size: 0.6rem;
+  padding-top: 1rem;
+}
 #consultation .layout-content .content_container .node-type-static #paragraph-id--11 .colone-picto h5 {
   font-size: 3.5rem;
   font-family: "gilroy-semibold";
@@ -2719,13 +2761,6 @@ body {
 #consultation .layout-content .content_container .node-type-static #paragraph-id--12 .field_field_texte {
   width: 80%;
 }
-#consultation .layout-content .content_container .node-type-static #paragraph-id--12::after {
-  content: "";
-  display: block;
-  border-bottom: solid 1px rgb(7, 50, 194);
-  width: 100%;
-  padding-bottom: 2rem;
-}
 #consultation .layout-content .content_container .node-type-static #paragraph-id--13 .field_field_texte .colone-picto {
   display: flex;
   flex-direction: row;

web/themes/custom/quartiers_de_demain/src/assets/js/quartiers_de_demain.js

@@ -661,6 +661,30 @@ document.addEventListener("DOMContentLoaded", function() {
 });
 
 
+document.addEventListener("DOMContentLoaded", function () {
+  // Fonction pour déplacer le bloc en fonction de la taille de l'écran
+  function moveLanguageSwitcher() {
+    const languageSwitcher = document.getElementById("block-quartiers-de-demain-selecteurdelangue");
+    const navContainer = document.querySelector(".header_nav_container");
+
+    if (window.innerWidth <= 810) { // Si écran téléphone
+      if (languageSwitcher && navContainer && !navContainer.contains(languageSwitcher)) {
+        navContainer.appendChild(languageSwitcher); // Déplace le bloc dans header_nav_container
+      }
+    } else { // Si écran non téléphone
+      const headerRightContainer = document.querySelector(".header_right_container");
+      if (languageSwitcher && headerRightContainer && !headerRightContainer.contains(languageSwitcher)) {
+        headerRightContainer.appendChild(languageSwitcher); // Remet le bloc dans sa position initiale
+      }
+    }
+  }
+
+  // Déclencher au chargement et au redimensionnement
+  moveLanguageSwitcher();
+  window.addEventListener("resize", moveLanguageSwitcher);
+});
+
+
 })(jQuery, window);
 
 

web/themes/custom/quartiers_de_demain/src/assets/scss/partials/header.scss

@@ -11,6 +11,46 @@ header{
    
     // transition: height 2s ease-in-out, width 2s ease-in-out; /* Transition pour le changement de taille */
     // transition: height 0.3s, padding 0.3s; /* Add transition for smooth resizing */
+    
+    .language-switcher-language-url{
+        text-transform: uppercase;
+        color: white;
+
+        ul{
+            display: flex;
+            flex-direction: row;   
+            font-size:0.6rem;
+            padding: 0;
+            width: fit-content;
+
+            @media(max-width: 810px){
+                font-size: 00.9rem;      
+            }
+            // @media(max-width: 500px){
+            //     flex-direction: column;
+            //     // margin-bottom: 0;
+            //     margin: auto;      
+            // }
+            li a {
+                color: white;
+                font-family: 'gilroy-light';
+
+            }
+            li:nth-child(1){
+                &::after{
+                    content: " / ";
+                    white-space: pre;
+                    @media(max-width: 660px){
+                        // content:none ;      
+                    }
+                }
+            }
+            .is-active{
+                font-family: 'gilroy-bold';
+            }
+        }
+    }
+    
     @media(max-width: 810px){
         height: 100vh;
     }
@@ -146,6 +186,7 @@ header{
         z-index: -1 ;
         @media(max-width: 1090px){
             // text-align:left;
+            height: fit-content;
         }
         @media(max-width: 500px){
             flex: 0 0 40%;
@@ -205,6 +246,48 @@ header{
 
             }
         }
+        #block-quartiers-de-demain-selecteurdelangue{
+            width: fit-content;
+            margin: auto;
+        //     .language-switcher-language-url{
+        //         text-transform: uppercase;
+        //         color: white;
+    
+        //         ul{
+        //             display: flex;
+        //             flex-direction: row;   
+        //             font-size:0.6rem;
+        //             padding: 0;
+    
+        //             @media(max-width: 660px){
+        //                 margin-bottom: 0;      
+        //             }
+        //             @media(max-width: 500px){
+        //                 flex-direction: column;
+        //                 // margin-bottom: 0;
+        //                 margin: auto;      
+        //             }
+        //             li a {
+        //                 color: white;
+        //                 font-family: 'gilroy-light';
+    
+        //             }
+        //             li:nth-child(1){
+        //                 &::after{
+        //                     content: " / ";
+        //                     white-space: pre;
+        //                     @media(max-width: 660px){
+        //                         content:none ;      
+        //                     }
+        //                 }
+        //             }
+        //             .is-active{
+        //                 font-family: 'gilroy-bold';
+        //             }
+        //         }
+        //     }
+        }
+       
     }
 
   .header_nav_container.hidden {