Merge branch 'master' into prod

This commit is contained in:
Bachir Soussi Chiadmi 2023-06-27 23:00:03 +02:00
commit 2337038abc
20 changed files with 493 additions and 18 deletions

View File

@ -17,6 +17,7 @@ dependencies:
- field.field.node.projet.field_partenaires
- field.field.node.projet.field_programme
- field.field.node.projet.field_projets_lies
- field.field.node.projet.field_region
- field.field.node.projet.field_ressources_liees
- field.field.node.projet.field_textes
- field.field.node.projet.field_themes_lies
@ -47,7 +48,7 @@ third_party_settings:
label: Tabs
region: content
parent_name: ''
weight: 3
weight: 4
format_type: tabs
format_settings:
classes: ''
@ -59,7 +60,7 @@ third_party_settings:
label: Équipes
region: content
parent_name: group_tabs
weight: 10
weight: 11
format_type: tab
format_settings:
classes: ''
@ -73,7 +74,7 @@ third_party_settings:
label: Partenaires
region: content
parent_name: group_tabs
weight: 11
weight: 12
format_type: tab
format_settings:
classes: ''
@ -105,7 +106,7 @@ third_party_settings:
label: Liens
region: content
parent_name: group_tabs
weight: 12
weight: 13
format_type: tab
format_settings:
classes: ''
@ -120,7 +121,7 @@ third_party_settings:
label: Media
region: content
parent_name: group_tabs
weight: 20
weight: 15
format_type: tab
format_settings:
classes: ''
@ -138,7 +139,7 @@ third_party_settings:
label: Details
region: content
parent_name: ''
weight: 20
weight: 5
format_type: details_sidebar
format_settings:
classes: ''
@ -169,7 +170,7 @@ third_party_settings:
label: Adresse
region: content
parent_name: group_tabs
weight: 9
weight: 10
format_type: tab
format_settings:
classes: ''
@ -266,7 +267,7 @@ content:
third_party_settings: { }
field_ge:
type: geofield_latlon
weight: 28
weight: 29
region: content
settings:
html5_geolocation: false
@ -318,6 +319,12 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
field_region:
type: options_select
weight: 3
region: content
settings: { }
third_party_settings: { }
field_ressources_liees:
type: entity_reference_autocomplete
weight: 10

View File

@ -18,6 +18,7 @@ dependencies:
- field.field.node.projet.field_partenaires
- field.field.node.projet.field_programme
- field.field.node.projet.field_projets_lies
- field.field.node.projet.field_region
- field.field.node.projet.field_ressources_liees
- field.field.node.projet.field_textes
- field.field.node.projet.field_themes_lies
@ -67,6 +68,7 @@ hidden:
field_memo: true
field_partenaires: true
field_projets_lies: true
field_region: true
field_ressources_liees: true
field_textes: true
field_themes_lies: true

View File

@ -17,6 +17,7 @@ dependencies:
- field.field.node.projet.field_partenaires
- field.field.node.projet.field_programme
- field.field.node.projet.field_projets_lies
- field.field.node.projet.field_region
- field.field.node.projet.field_ressources_liees
- field.field.node.projet.field_textes
- field.field.node.projet.field_themes_lies
@ -136,6 +137,14 @@ content:
third_party_settings: { }
weight: 5
region: content
field_region:
type: entity_reference_label
label: above
settings:
link: true
third_party_settings: { }
weight: 16
region: content
field_ressources_liees:
type: entity_reference_label
label: above

View File

@ -18,6 +18,7 @@ dependencies:
- field.field.node.projet.field_partenaires
- field.field.node.projet.field_programme
- field.field.node.projet.field_projets_lies
- field.field.node.projet.field_region
- field.field.node.projet.field_ressources_liees
- field.field.node.projet.field_textes
- field.field.node.projet.field_themes_lies
@ -80,6 +81,7 @@ hidden:
field_memo: true
field_partenaires: true
field_projets_lies: true
field_region: true
field_ressources_liees: true
field_textes: true
field_themes_lies: true

View File

@ -0,0 +1,29 @@
uuid: 50db3c13-4a61-40dc-8fa0-d7e18f41788e
langcode: fr
status: true
dependencies:
config:
- field.storage.node.field_region
- node.type.projet
- taxonomy.vocabulary.regions
id: node.projet.field_region
field_name: field_region
entity_type: node
bundle: projet
label: Région
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:taxonomy_term'
handler_settings:
target_bundles:
regions: regions
sort:
field: name
direction: asc
auto_create: false
auto_create_bundle: ''
field_type: entity_reference

View File

@ -0,0 +1,20 @@
uuid: 22a1ea89-6d52-4507-b2b1-3de0b0cd88dc
langcode: fr
status: true
dependencies:
module:
- node
- taxonomy
id: node.field_region
field_name: field_region
entity_type: node
type: entity_reference
settings:
target_type: taxonomy_term
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

View File

@ -43,6 +43,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: top
weight: -3
uuid: 6319006a-015c-459c-996b-79d404f7455f
@ -54,8 +55,9 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -4
weight: -2
uuid: 2ca2f1a3-98b4-41bf-bb67-e17fdd93f1f2
4fc90a5b-8a2d-4f21-9718-e65b9982d59a:
id: 'views_block:programme_toc-block_4'
@ -65,6 +67,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -7
uuid: 4fc90a5b-8a2d-4f21-9718-e65b9982d59a
@ -76,6 +79,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: top
weight: -4
uuid: eb6ccc12-1ccc-4996-9797-be755e42b297
@ -87,6 +91,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: bottom
weight: 0
uuid: 9dbcea4e-26fe-4d78-a245-b192012bd799
@ -135,8 +140,9 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -3
weight: -1
uuid: 9f70ea8b-3a5f-4e48-97b0-2b3d5e5e7d03
232f18ef-a92c-451e-b917-e436b6cbc195:
id: 'views_block:programme_toc-block_9'
@ -146,8 +152,9 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -5
weight: -3
uuid: 232f18ef-a92c-451e-b917-e436b6cbc195
b564145a-2058-4710-8204-50569d4f0bf0:
id: 'views_block:programme_toc-block_13'
@ -157,8 +164,9 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -6
weight: -4
uuid: b564145a-2058-4710-8204-50569d4f0bf0
b84fe2f8-7c0b-4976-aa63-d8dc5ae66fc0:
id: 'views_block:programme_toc-block_16'
@ -168,12 +176,13 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
arguments:
nid:
type: node_nid
value: '[node:nid]'
region: first
weight: -1
weight: 0
uuid: b84fe2f8-7c0b-4976-aa63-d8dc5ae66fc0
532e0e26-eab4-476f-a964-fd68221d5619:
id: prog_exode_urbain_link
@ -185,6 +194,16 @@ variant_settings:
weight: -6
uuid: 532e0e26-eab4-476f-a964-fd68221d5619
link_title: 'Exode Urbain'
698f5eef-78b0-44a3-851b-3adcddfcd119:
id: prog_palpite_link
label: 'Le Palmarès Palpite'
label_display: '0'
provider: popsu_link_block
context_mapping: { }
region: first
weight: -5
uuid: 698f5eef-78b0-44a3-851b-3adcddfcd119
link_title: 'Le Palmarès Palpite'
page_title: ''
layout: layout_threecol_25_50_25
layout_settings:

View File

@ -95,6 +95,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -3
uuid: 8b03ade6-e854-4bb0-8a9b-34722a2854a3
@ -157,6 +158,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -2
uuid: c4929f5b-0062-4e02-b61e-c2433a85ac26

View File

@ -360,6 +360,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -9
uuid: a62c7914-d906-4dfa-aec5-8b58fe51046d
@ -371,6 +372,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -8
uuid: a6dd71ed-49c0-4166-b952-7f8269fc0536
@ -382,6 +384,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -7
uuid: 92053447-9110-481c-a48d-45abe5289a1e

View File

@ -234,6 +234,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -7
uuid: 7fd3954d-4223-48fd-8ed9-f719cdb706f0
@ -245,6 +246,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -5
uuid: b12c9988-1636-44e6-8de3-9f1d07a0561e
@ -266,6 +268,7 @@ variant_settings:
context_mapping: { }
views_label: 'Ressources liées'
items_per_page: none
exposed: { }
arguments:
nid:
type: node_nid
@ -281,6 +284,7 @@ variant_settings:
context_mapping: { }
views_label: ''
items_per_page: none
exposed: { }
region: first
weight: -6
uuid: 40dfc621-4e0d-4d06-9567-1fb89f13c22b

View File

@ -308,6 +308,7 @@ variant_settings:
context_mapping: { }
views_label: Collection
items_per_page: none
exposed: { }
arguments:
tid:
type: taxonomy

View File

@ -16,6 +16,7 @@ dependencies:
- field.storage.node.field_programme
- field.storage.node.field_projet
- field.storage.node.field_projets_lies
- field.storage.node.field_region
- field.storage.node.field_ressources_liees
- field.storage.node.field_sous_titre
- field.storage.node.field_theme
@ -33,6 +34,7 @@ dependencies:
- node.type.ressource
- node.type.static
- node.type.theme
- taxonomy.vocabulary.regions
- taxonomy.vocabulary.types_de_theme
- taxonomy.vocabulary.villes
module:
@ -2584,6 +2586,69 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
field_region:
id: field_region
table: node__field_region
field: field_region
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: Région
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
settings:
link: true
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
field_ville:
id: field_ville
table: node__field_ville
@ -3273,6 +3338,62 @@ display:
level_labels: ''
hierarchy_depth: 0
required_depth: 0
field_region_target_id:
id: field_region_target_id
table: node__field_region
field: field_region_target_id
relationship: none
group_type: group
admin_label: ''
plugin_id: taxonomy_index_tid
operator: or
value: { }
group: 1
exposed: true
expose:
operator_id: field_region_target_id_op
label: 'Région (field_region)'
description: ''
use_operator: false
operator: field_region_target_id_op
operator_limit_selection: false
operator_list: { }
identifier: field_region_target_id
required: false
remember: false
multiple: false
remember_roles:
authenticated: authenticated
anonymous: '0'
admin: '0'
root: '0'
user: '0'
editeur: '0'
reduce: false
is_grouped: false
group_info:
label: ''
description: ''
identifier: ''
optional: true
widget: select
multiple: false
remember: false
default_group: All
default_group_multiple: { }
group_items: { }
reduce_duplicates: false
vid: regions
type: select
hierarchy: false
limit: true
error_message: true
save_lineage: false
force_deepest: false
parent: 0
level_labels: ''
hierarchy_depth: 0
required_depth: 0
field_memo_value:
id: field_memo_value
table: node__field_memo
@ -3465,6 +3586,7 @@ display:
- 'config:field.storage.node.field_partenaires'
- 'config:field.storage.node.field_programme'
- 'config:field.storage.node.field_projets_lies'
- 'config:field.storage.node.field_region'
- 'config:field.storage.node.field_themes_lies'
- 'config:field.storage.node.field_type_de_projet'
- 'config:field.storage.node.field_ville'

View File

@ -9,6 +9,7 @@ dependencies:
- field.storage.node.field_logo
- field.storage.node.field_programme
- field.storage.node.field_projet
- field.storage.node.field_region
- field.storage.node.field_sous_titre
- field.storage.node.field_themes_lies
- field.storage.node.field_type_evenement
@ -568,6 +569,69 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
field_region:
id: field_region
table: node__field_region
field: field_region
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: ''
exclude: true
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
settings:
link: false
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
view_node:
id: view_node
table: node
@ -819,7 +883,11 @@ display:
style:
type: default
options:
grouping: { }
grouping:
-
field: field_region
rendered: true
rendered_strip: false
row_class: ''
default_row_class: true
row:
@ -872,6 +940,7 @@ display:
- 'user.node_grants:view'
- user.permissions
tags:
- 'config:field.storage.node.field_region'
- 'config:field.storage.node.field_ville'
block_11:
id: block_11
@ -2749,6 +2818,69 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
field_region:
id: field_region
table: node__field_region
field: field_region
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: ''
exclude: true
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
settings:
link: false
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
view_node:
id: view_node
table: node
@ -3000,7 +3132,11 @@ display:
style:
type: default
options:
grouping: { }
grouping:
-
field: field_region
rendered: true
rendered_strip: false
row_class: ''
default_row_class: true
row:
@ -3053,6 +3189,7 @@ display:
- 'user.node_grants:view'
- user.permissions
tags:
- 'config:field.storage.node.field_region'
- 'config:field.storage.node.field_ville'
block_5:
id: block_5

View File

@ -0,0 +1,89 @@
<?php
namespace Drupal\popsu_link_block\Plugin\Block;
use Drupal\Core\Block\BlockBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\Core\Link;
// use Drupal\Core\Utility\Token;
/**
* Provides a 'ProgExodeurbainLink' block.
*
* @Block(
* id = "prog_palpite_link",
* admin_label = @Translation("Prog palpite link"),
* )
*/
class ProgPalpiteLink extends BlockBase {
public function blockForm($form, FormStateInterface $form_state) {
$form = parent::blockForm($form, $form_state);
$config = $this->getConfiguration();
$form['link_title_wrapper'] = [
'#type' => 'container'
];
$form['link_title_wrapper']['link_title'] = [
'#type' => 'textfield',
'#title' => 'Link title',
'#default_value' => isset($config['link_title']) ? $config['link_title'] : "Ressources",
'#element_validate' => array('token_element_validate'),
'#token_types' => array('node'),
];
$form['link_title_wrapper']['token_tree'] = array(
'#theme' => 'token_tree_link',
'#token_types' => array('node'),
'#show_restricted' => TRUE,
'#global_types' => FALSE,
'#weight' => 90,
);
return $form;
}
public function blockSubmit($form, FormStateInterface $form_state)
{
parent::blockSubmit($form, $form_state);
$values = $form_state->getValues();
$link_title = $values['link_title_wrapper']['link_title'];
$this->configuration['link_title'] = $link_title;
}
/**
* {@inheritdoc}
*/
public function build() {
// $config = $this->getConfiguration();
$build = [];
$node = \Drupal::routeMatch()->getParameter('node');
if ($node instanceof \Drupal\node\Entity\Node) {
// check if programme
if($node->bundle() == 'programme'){
// if yes get id
// todo set the hardcoded nid number as a parameter somewhere
$nid = $node->id() == 6 ? $node->id() : false;
}
if($nid){
$title = "Le Palmarès Palpite";
$url = Url::fromRoute('entity.node.canonical');
// todo make the the hardcoded target nid as a parameter somewhere (recorded on the node ?)
$url->setRouteParameter("node", 912);
$url->setOption('attributes', array("class"=>array('prog-palpite-link')));
$build['prog_palpite_link'] = array(
'#title' => $title,
'#type' => 'link',
'#url' => $url
);
}
}
return $build;
}
}

@ -1 +1 @@
Subproject commit 27bf1819cdd12b38553d91c8f95eaf2659902b99
Subproject commit 5069345d9dffca8ff935d7a01d2bc97a1272f063

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -303,6 +303,7 @@ if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").leng
$('.views-element-container header').click(function(){
$(this).parent().find(".view-grouping").fadeToggle();
$(this).parent().find(".views-row").fadeToggle();
$(this).parent().find("h3").fadeToggle();
});
$('.view-grouping-header').click(function(){

View File

@ -8,6 +8,12 @@
}
}
}
//spec
.programme-883{
.block-region-third{
margin-top: 0% !important;
}
}
.page-node-type-programme.programme-2{
#programme_toc-block_9{
@ -184,6 +190,12 @@
background: $col-exode !important;
}
}
.programme-883{
.views-field{
background: $col-transition !important;
}
}
.views-row{
// margin-top: 2rem;
.views-field-field-image{
@ -410,6 +422,15 @@
grid-column: 1 / span 3;
}
.block-region-first{
#programme_toc-block_4{
h3{
display: none;
padding-left: .4rem;
font-weight: 600;
}
}
@include breakpoint(small down) {
text-align: center;
@ -420,6 +441,7 @@
left: 0;
width: 22%;
padding: 1rem 1.5rem ;
a.prog-palpite-link,
a.prog-ressources-link,
a.prog-exodeurbain-link{
font-family: "duke";
@ -461,6 +483,7 @@
}
}
.views-row, .view-grouping{
display: none;
padding: 0 0 0 1.2rem;

View File

@ -9,6 +9,11 @@
.views-row{
padding-left: 1rem;
}
h3{
display: none;
padding-left: .4rem;
font-weight: 600;
}
}
// @include breakpoint(small down) {
// text-align: center;