9 Commits

20 changed files with 324 additions and 56 deletions

View File

@@ -126,11 +126,17 @@
"merge-extra": true
},
"patches": {
"drupal/core": {
"Image field generates only default language URL when linking to corresponding entity. https://www.drupal.org/node/2645922?no_cache=1733132298":"https://www.drupal.org/files/issues/2021-03-15/2645922-45.patch"
},
"drupal/social_media_links":{
"Replace Twitter with X https://www.drupal.org/project/social_media_links/issues/3384469": "https://www.drupal.org/files/issues/2023-09-12/social_media_links-change_twitter_to_x-3384469-7.patch"
},
"drupal/image_field_caption":{
"Rewrite module to use default field storage https://www.drupal.org/project/image_field_caption/issues/3472997": "./patches/image_field_caption_3472997_12.patch"
},
"drupal/video_embed_field":{
"Support Youtube Live urls https://www.drupal.org/project/video_embed_field/issues/3417567":"https://www.drupal.org/files/issues/2024-01-27/video_embed_field--support-live--3417567--2.patch"
}
},
"oldpatches": {

View File

@@ -0,0 +1,8 @@
uuid: dc650ace-a4b8-479c-bb14-fa42e7534214
langcode: fr
status: true
dependencies: { }
id: live_youtube
label: live-youtube
revision: 0
description: ''

View File

@@ -0,0 +1,49 @@
uuid: 9d4c0c8b-d55b-4f5d-a1b8-f1df7af95607
langcode: fr
status: true
dependencies:
config:
- block_content.type.live_youtube
- field.field.block_content.live_youtube.field_descritpion
- field.field.block_content.live_youtube.field_titre
- field.field.block_content.live_youtube.field_youtube
module:
- text
- video_embed_field
id: block_content.live_youtube.default
targetEntityType: block_content
bundle: live_youtube
mode: default
content:
field_descritpion:
type: text_textarea
weight: 2
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_titre:
type: string_textfield
weight: 1
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_youtube:
type: video_embed_field_textfield
weight: 3
region: content
settings: { }
third_party_settings: { }
info:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
hidden:
langcode: true

View File

@@ -0,0 +1,48 @@
uuid: a96096d1-f93c-48f3-9b6c-f9940f4ee2fc
langcode: fr
status: true
dependencies:
config:
- block_content.type.live_youtube
- field.field.block_content.live_youtube.field_descritpion
- field.field.block_content.live_youtube.field_titre
- field.field.block_content.live_youtube.field_youtube
module:
- manage_display
- text
- video_embed_field
id: block_content.live_youtube.default
targetEntityType: block_content
bundle: live_youtube
mode: default
content:
field_descritpion:
type: text_default
label: visually_hidden
settings: { }
third_party_settings: { }
weight: 1
region: content
field_titre:
type: title
label: visually_hidden
settings:
link_to_entity: false
tag: h2
third_party_settings: { }
weight: 0
region: content
field_youtube:
type: video_embed_field_video
label: visually_hidden
settings:
autoplay: true
responsive: true
width: 854
height: 480
third_party_settings: { }
weight: 2
region: content
hidden:
langcode: true
search_api_excerpt: true

View File

@@ -0,0 +1,24 @@
uuid: e3139bc9-11e2-49a5-a296-5d6f08499a78
langcode: fr
status: true
dependencies:
config:
- block_content.type.live_youtube
- field.storage.block_content.field_descritpion
- filter.format.wysiwyg
module:
- text
id: block_content.live_youtube.field_descritpion
field_name: field_descritpion
entity_type: block_content
bundle: live_youtube
label: Description
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
allowed_formats:
- wysiwyg
field_type: text_long

View File

@@ -0,0 +1,19 @@
uuid: f32e837b-2b65-438e-9b1a-681267ed114d
langcode: fr
status: true
dependencies:
config:
- block_content.type.live_youtube
- field.storage.block_content.field_titre
id: block_content.live_youtube.field_titre
field_name: field_titre
entity_type: block_content
bundle: live_youtube
label: Titre
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string

View File

@@ -0,0 +1,25 @@
uuid: 0557bdb1-03b5-4b9f-8941-63d7880a2e88
langcode: fr
status: true
dependencies:
config:
- block_content.type.live_youtube
- field.storage.block_content.field_youtube
module:
- video_embed_field
id: block_content.live_youtube.field_youtube
field_name: field_youtube
entity_type: block_content
bundle: live_youtube
label: youtube
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
allowed_providers:
youtube: youtube
youtube_playlist: '0'
vimeo: '0'
field_type: video_embed_field

View File

@@ -0,0 +1,19 @@
uuid: 833e03f3-0e59-4537-b1eb-3d5b3eba9e0f
langcode: fr
status: true
dependencies:
module:
- block_content
- text
id: block_content.field_descritpion
field_name: field_descritpion
entity_type: block_content
type: text_long
settings: { }
module: text
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

View File

@@ -0,0 +1,21 @@
uuid: c8b30bc0-f7cb-49a0-8bb1-2a83fef02fb2
langcode: fr
status: true
dependencies:
module:
- block_content
id: block_content.field_titre
field_name: field_titre
entity_type: block_content
type: string
settings:
max_length: 255
case_sensitive: false
is_ascii: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

View File

@@ -0,0 +1,19 @@
uuid: cc74fdc1-0972-4669-a610-c3ec2df20732
langcode: fr
status: true
dependencies:
module:
- block_content
- video_embed_field
id: block_content.field_youtube
field_name: field_youtube
entity_type: block_content
type: video_embed_field
settings: { }
module: video_embed_field
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

View File

@@ -6,7 +6,10 @@ dependencies:
- page_manager.page.home
- views.view.actus
- views.view.presentation
content:
- 'block_content:live_youtube:1d330f27-3197-43ed-8f7f-a1b05826c25b'
module:
- block_content
- config_pages
- panels
- views
@@ -30,7 +33,7 @@ variant_settings:
items_per_page: none
exposed: { }
region: content
weight: 0
weight: 1
uuid: f1486b62-7ff8-475b-b6a1-e153b6b6fb89
css_classes:
- ''
@@ -60,7 +63,7 @@ variant_settings:
config_page_type: deroulement
config_page_view_mode: full
region: content
weight: 1
weight: 2
uuid: 346ce88d-2925-4bf8-884d-dfbca1e8d5b6
css_classes:
- ''
@@ -76,12 +79,28 @@ variant_settings:
items_per_page: none
exposed: { }
region: content
weight: 2
weight: 0
uuid: d4d27033-dc91-45d7-adc0-8690fd0ab27a
css_classes:
- ''
html_id: ''
css_styles: ''
e68622dd-ffb9-463b-af33-0955e75f8019:
id: 'block_content:1d330f27-3197-43ed-8f7f-a1b05826c25b'
label: 'Live 03-03-2025'
label_display: visible
provider: block_content
status: true
info: ''
view_mode: full
context_mapping: { }
region: content
weight: -1
uuid: e68622dd-ffb9-463b-af33-0955e75f8019
css_classes:
- ''
html_id: ''
css_styles: ''
page_title: ''
layout: layout_onecol
layout_settings:

View File

@@ -69,11 +69,20 @@ variant_settings:
context_mapping:
entity: node
formatter:
type: file_default
type: formatter_suite_general_file_link
weight: 0
label: visually_hidden
settings:
use_description_as_link_text: true
titleStyle: text_from_link
titleCustomText: ''
showSize: 0
showIcon: 0
classes: ''
showLink: 1
openLinkIn: _blank
linkTopic: any
listStyle: span
listSeparator: ', '
third_party_settings: { }
region: third
weight: -5

View File

@@ -7,7 +7,7 @@
text-align: center;
position: relative;
width: 155%;
max-width: 800px;
max-width: 600px;
margin: 0 auto;
height: auto;
}
@@ -63,7 +63,7 @@
color: white;
background: black;
text-transform: uppercase;
font-size: 0.6rem;
font-size: 0.5rem;
padding-left: 0.5rem;
text-decoration: none;
margin-top: 0.7rem;
@@ -83,9 +83,10 @@
#popup-content {
width: 300px;
padding-right: 30px;
font-size: 0.6rem !important;
}
#popup-content p {
font-size: 0.7rem;
font-size: 0.6rem !important;
}
@media (max-width: 810px) {
#popup-content {

View File

@@ -11,7 +11,7 @@
function q2d_mod_theme() {
return array(
'svg_mapsites' => array(
'variables' => array('vpw' => null, 'vph' => null, 'sites' => []),
'variables' => array('vpw' => null, 'vph' => null, 'sites' => [], 'label' => null),
),
);
}

View File

@@ -41,12 +41,14 @@ class SitesMap extends BlockBase {
foreach($allSites as $index => $site){
$langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
// $title = $site->get('title')->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
$link_options = ['absolute' => TRUE, 'attributes' => ['class' => 'site-link'], 'language' => \Drupal::languageManager()->getLanguage($langcode)]; // Passer 'absolute' à TRUE
$site_url = $site->toUrl('canonical', $link_options)->toString(); // URL absolue pour le data-url
$site_link_object = Link::createFromRoute(t("got to site"), 'entity.node.canonical', ['node' => $site->id()], $link_options);
$link = $site_link_object->toString()->getGeneratedLink();
@@ -61,9 +63,9 @@ class SitesMap extends BlockBase {
$x = round(($lon - $lonLeft) / ($lonRight - $lonLeft) * $vp_w);
$y = round(($latTop - $lat) / ($latTop - $latBottom) * $vp_h);
$r = 15;
$r = 12;
$m = -$r/1.5+3;
$l = $r/1.5 +4;
$l = $r/1.5 +2.5;
$sites_paths .= <<<SVGSITEPATH
<g
id="site-$index"
@@ -99,6 +101,7 @@ class SitesMap extends BlockBase {
],
'svg_mapsites' => [
'#theme' => 'svg_mapsites',
'#label' => "Les 10 sites de projet",
'#sites' => $sites_paths,
'#vpw' => $vp_w,
'#vph' => $vp_h,
@@ -115,6 +118,7 @@ class SitesMap extends BlockBase {
// '#markup' => $this->t('Hello, Sites Map!'),
// ];
}
public function getCacheMaxAge() {
return 0;
}

View File

@@ -1,4 +1,7 @@
<div id="sites-map-container">
<h2>{{label}}</h2>
{# <svg {{ svg_attributes }}>
<path {{ path_attributes }}></path>
</svg> #}

View File

@@ -479,7 +479,7 @@ header .header_nav_container #block-quartiers-de-demain-entete ul li a {
font-size: 0.6rem;
}
}
@media (max-width: 500px) {
@media (max-width: 810px) {
header .header_nav_container #block-quartiers-de-demain-entete ul li a {
display: flex;
flex-direction: column;
@@ -3013,6 +3013,12 @@ body {
grid-column: 2/span 9;
}
}
@media (max-width: 510px) {
.node-type-static .layout-content .content_container #block-quartiers-de-demain-titredepage {
margin-top: 13rem;
grid-column: 2/span 9;
}
}
.node-type-static .layout-content .content_container #block-quartiers-de-demain-titredepage h1 {
text-transform: none;
color: black;
@@ -3377,9 +3383,6 @@ body {
border-bottom: none;
padding-bottom: 0;
}
.node-type-site .layout--threecol-25-50-25 .layout__region--second .block-region-second .field_field_parties div {
width: fit-content;
}
.node-type-site .layout--threecol-25-50-25 .layout__region--second .block-region-second div:has(.field_field_parties) {
margin-top: 2rem;
width: 100%;
@@ -3409,6 +3412,12 @@ body {
font-size: 0.8rem;
}
}
.node-type-site .layout--threecol-25-50-25 .layout__region--second .block-region-second .paragraph--type--site-video .field_field_titre_site {
display: none;
}
.node-type-site .layout--threecol-25-50-25 .layout__region--second .block-region-second .paragraph--type--site-video .field_field_video {
margin-bottom: 2rem;
}
.node-type-site .layout--threecol-25-50-25 .layout__region--second .block-region-second .paragraph--type--site-diapo .field_field_images .diaporama {
display: flex !important;
flex-direction: row !important;
@@ -3562,6 +3571,10 @@ body {
flex-direction: column;
}
.html.js.sr body.node-type-site.node-id-40 div.dialog-off-canvas-main-canvas div#page-node.layout-container main div.layout-content div.content_container div.layout.layout--threecol-25-50-25 div.layout__region.layout__region--third div.block-region-third div div.field_field_documents div div span {
visibility: hidden;
}
main {
background-color: #f6f7f3;
}

View File

@@ -244,7 +244,7 @@
}
.field_field_parties{
div{width: fit-content;}
// div{width: fit-content;}
// width: 70%;
}
div:has(.field_field_parties){
@@ -279,6 +279,15 @@
}
}
.paragraph--type--site-video{
.field_field_titre_site{
// margin-bottom: 1rem;
display: none;
}
.field_field_video{
margin-bottom: 2rem;
}
}
.paragraph--type--site-diapo{
.field_field_images {
.diaporama{
@@ -438,6 +447,8 @@
padding-bottom: 0.2rem;
}
}
}
}
@@ -448,4 +459,7 @@
.field_field_liens_site > div:nth-child(2) > div:nth-child(1){
display: flex;
flex-direction: column;
}
}
.html.js.sr body.node-type-site.node-id-40 div.dialog-off-canvas-main-canvas div#page-node.layout-container main div.layout-content div.content_container div.layout.layout--threecol-25-50-25 div.layout__region.layout__region--third div.block-region-third div div.field_field_documents div div span{
visibility: hidden;
}

View File

@@ -15,6 +15,10 @@
margin-top: 10rem;
grid-column: 2 /span 9;
}
@media(max-width: 510px){
margin-top: 13rem;
grid-column: 2 /span 9;
}
h1{
text-transform: none;

View File

@@ -221,7 +221,7 @@ header{
@media(max-width:1090px){
font-size: 0.6rem;
}
@media(max-width: 500px){
@media(max-width: 810px){
display: flex;
flex-direction: column;
align-items: center;
@@ -249,43 +249,6 @@ 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';
// }
// }
// }
}
}