diff --git a/composer.json b/composer.json index 677b3d7..b60a03d 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "drupal/paragraphs": "1.x-dev@dev", "drupal/role_delegation": "^1.1", "drupal/structure_sync": "^2.0", + "drupal/views_conditional": "^1.5", "drupal/webform": "^6.1", "geocoder-php/mapquest-provider": "^4.2", "wikimedia/composer-merge-plugin": "^2.0" @@ -54,7 +55,11 @@ "drupal/console-extend-plugin": true, "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, +<<<<<<< HEAD "drupal/core-project-message": false, +======= + "drupal/core-project-message": true, +>>>>>>> d96e14918d8744277184836ca08599e09512fdba "wikimedia/composer-merge-plugin": true } }, diff --git a/composer.lock b/composer.lock index 23d1a52..eac0643 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3103e49e1d043d23aba96d4e19abe16d", + "content-hash": "2d02333ad4ccdbef0bb58f0885e81016", "packages": [ { "name": "alchemy/zippy", @@ -9081,6 +9081,62 @@ "docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo" } }, + { + "name": "drupal/views_conditional", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/views_conditional.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/views_conditional-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "bb7d13abc0919e01933152002b0bf4189e5e2d1a" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.5", + "datestamp": "1659989912", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "anand.toshniwal93", + "homepage": "https://www.drupal.org/user/3345088" + }, + { + "name": "MChittenden", + "homepage": "https://www.drupal.org/user/2288348" + }, + { + "name": "ofry", + "homepage": "https://www.drupal.org/user/2740599" + }, + { + "name": "shelane", + "homepage": "https://www.drupal.org/user/2674989" + } + ], + "description": "Allows conditional views output.", + "homepage": "https://www.drupal.org/project/views_conditional", + "support": { + "source": "https://git.drupalcode.org/project/views_conditional" + } + }, { "name": "drupal/views_ef_fieldset", "version": "1.5.0", @@ -15342,5 +15398,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/config/sync/core.entity_view_display.config_pages.home_front.default.yml b/config/sync/core.entity_view_display.config_pages.home_front.default.yml index ed14efa..e1d933b 100644 --- a/config/sync/core.entity_view_display.config_pages.home_front.default.yml +++ b/config/sync/core.entity_view_display.config_pages.home_front.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.config_pages.home_front.field_titre - field.field.config_pages.home_front.field_video_front module: + - advanced_text_formatter - image - link - video_embed_field @@ -49,18 +50,64 @@ content: weight: 2 region: content field_sous_titre: - type: string + type: advanced_text label: hidden settings: - link_to_entity: false + trim_length: '60000' + ellipsis: '1' + word_boundary: '1' + filter: limit_html + format: plain_text + allowed_html: + - a + - b + - br + - dd + - dl + - dt + - em + - i + - li + - ol + - p + - strong + - u + - ul + - br + use_summary: 0 + token_replace: 0 + autop: 0 third_party_settings: { } weight: 1 region: content field_titre: - type: string + type: advanced_text label: hidden settings: - link_to_entity: false + trim_length: '6000' + ellipsis: '1' + word_boundary: '1' + filter: limit_html + format: plain_text + allowed_html: + - a + - b + - br + - dd + - dl + - dt + - em + - i + - li + - ol + - p + - strong + - u + - ul + - br + use_summary: 0 + token_replace: 0 + autop: 0 third_party_settings: { } weight: 0 region: content diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 8789b50..b00072f 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -125,6 +125,7 @@ module: video_embed_field: 0 views_bulk_edit: 0 views_bulk_operations: 0 + views_conditional: 0 views_ef_fieldset: 0 views_ui: 0 webform: 0 diff --git a/config/sync/image.style.map_popup.yml b/config/sync/image.style.map_popup.yml new file mode 100644 index 0000000..95f419c --- /dev/null +++ b/config/sync/image.style.map_popup.yml @@ -0,0 +1,15 @@ +uuid: f0a4500a-b3f3-4da1-a74f-47f25c39b95a +langcode: fr +status: true +dependencies: { } +name: map_popup +label: 'map_popup (300x150)' +effects: + 8297794a-e2d8-4eb0-bab7-786baf07b014: + uuid: 8297794a-e2d8-4eb0-bab7-786baf07b014 + id: image_scale_and_crop + weight: 1 + data: + width: 300 + height: 150 + anchor: center-center diff --git a/config/sync/page_manager.page_variant.node_view-panels_variant-1.yml b/config/sync/page_manager.page_variant.node_view-panels_variant-1.yml index 125f5fa..ae42813 100644 --- a/config/sync/page_manager.page_variant.node_view-panels_variant-1.yml +++ b/config/sync/page_manager.page_variant.node_view-panels_variant-1.yml @@ -5,7 +5,7 @@ dependencies: config: - page_manager.page.node_view content: - - 'block_content:custom:acfaf4e3-d7d0-42a6-a2a6-3c6ccd0e9344' + - 'block_content:custom:e6f826c7-4a3e-479b-8e83-2245dee7f931' module: - block_content - ctools_block @@ -230,18 +230,6 @@ variant_settings: region: top weight: -2 uuid: 4f0068bc-e2b1-4f5c-b7d9-3dabbbedd2f3 - e1eae88c-51bd-4ac6-9fe9-aed0600338f5: - id: 'block_content:acfaf4e3-d7d0-42a6-a2a6-3c6ccd0e9344' - label: 'Les actualités' - label_display: '0' - provider: block_content - status: true - info: '' - view_mode: full - context_mapping: { } - region: top - weight: -6 - uuid: e1eae88c-51bd-4ac6-9fe9-aed0600338f5 7d119477-5ae4-487c-a389-4c492e102bde: id: 'entity_field:node:field_partenaires' label: Partenaires @@ -259,6 +247,18 @@ variant_settings: region: second weight: -4 uuid: 7d119477-5ae4-487c-a389-4c492e102bde + d2dc69a3-5c0d-423e-87a9-cf92bd2d9f4e: + id: 'block_content:e6f826c7-4a3e-479b-8e83-2245dee7f931' + label: 'Les actualités lien' + label_display: '0' + provider: block_content + status: true + info: '' + view_mode: full + context_mapping: { } + region: top + weight: -6 + uuid: d2dc69a3-5c0d-423e-87a9-cf92bd2d9f4e page_title: '' layout: layout_threecol_25_50_25 layout_settings: diff --git a/config/sync/structure_sync.data.yml b/config/sync/structure_sync.data.yml index 376c975..ad1da38 100644 --- a/config/sync/structure_sync.data.yml +++ b/config/sync/structure_sync.data.yml @@ -292,6 +292,19 @@ menus: langcode: fr uuid: 4d296aca-5316-4106-828a-01624ca7853e blocks: + - + info: 'Les actualités lien' + langcode: fr + uuid: e6f826c7-4a3e-479b-8e83-2245dee7f931 + bundle: custom + revision_id: null + rev_id_current: null + fields: + body: + - + value: "

Les Actualités

\r\n" + summary: '' + format: wysiwyg - info: 'Projets lauréats' langcode: fr @@ -302,7 +315,7 @@ blocks: fields: body: - - value: "

Projets Lauréats

\r\n" + value: "

Projets Lauréats

\r\n" summary: '' format: wysiwyg - @@ -332,19 +345,6 @@ blocks: value: "

Les actualités

\r\n" summary: '' format: wysiwyg - - - info: 'Base de données' - langcode: fr - uuid: 4e5df355-e76c-4e44-bec0-e211d94f2640 - bundle: custom - revision_id: null - rev_id_current: null - fields: - body: - - - value: "

Base de données

\r\n" - summary: '' - format: wysiwyg - info: 'Ressource form' langcode: fr diff --git a/config/sync/views.view.projets.yml b/config/sync/views.view.projets.yml index 34b68ba..64da188 100644 --- a/config/sync/views.view.projets.yml +++ b/config/sync/views.view.projets.yml @@ -5,14 +5,19 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.storage.node.field_geofield + - field.storage.node.field_incube + - field.storage.node.field_photo + - image.style.map_popup - node.type.projet module: - better_exposed_filters - geofield + - image - leaflet_views - node - options - user + - views_conditional id: projets label: Projets module: views @@ -140,6 +145,11 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_incube: + id: field_incube + table: node__field_incube + field: field_incube + plugin_id: field pager: type: none options: @@ -148,7 +158,7 @@ display: exposed_form: type: bef options: - submit_button: Appliqué + submit_button: Appliquer reset_button: true reset_button_label: Réinitialiser exposed_sorts_label: 'Sort by' @@ -249,7 +259,7 @@ display: exposed: true expose: operator_id: '' - label: 'Projets Incubé' + label: 'Projet Incubé' description: '' use_operator: false operator: field_incube_value_op @@ -513,6 +523,7 @@ display: - user.permissions tags: - 'config:field.storage.node.field_geofield' + - 'config:field.storage.node.field_incube' block_1: id: block_1 display_title: 'Projets Block' @@ -624,12 +635,329 @@ display: - user.permissions tags: - 'config:field.storage.node.field_geofield' + - 'config:field.storage.node.field_incube' block_2: id: block_2 display_title: 'Projets map' display_plugin: block position: 2 display_options: + fields: + field_photo: + id: field_photo + table: node__field_photo + field: field_photo + 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: image + settings: + image_link: content + image_style: map_popup + group_column: '' + 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 + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: field + label: '' + exclude: false + alter: + alter_text: true + text: "{{ field_photo }}
\r\n{{ title }}" + 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: false + ellipsis: false + 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: value + type: string + settings: + link_to_entity: true + group_column: value + 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_geofield: + id: field_geofield + table: node__field_geofield + field: field_geofield + 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: value + type: geofield_default + settings: + output_format: wkt + output_escape: true + group_column: value + 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_incube: + id: field_incube + table: node__field_incube + field: field_incube + 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: value + type: boolean + settings: + format: default + format_custom_false: '' + format_custom_true: '' + group_column: value + 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 + views_conditional_field: + id: views_conditional_field + table: views_conditional + field: views_conditional_field + relationship: none + group_type: group + admin_label: '' + plugin_id: views_conditional_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 + if: field_incube + condition: eq + equalto: Activé + then: '#e10010ff' + then_translate: 0 + or: '#000191ff' + or_translate: 0 + strip_tags: 0 filters: status: id: status @@ -668,7 +996,7 @@ display: data_source: field_geofield entity_source: __base_table name_field: title - description_field: '' + description_field: title view_mode: full leaflet_map: stamen-toner-lite height: '400' @@ -690,7 +1018,7 @@ display: zoomFiner: 0 weight: '' icon: - iconType: marker + iconType: circle_marker iconUrl: '' shadowUrl: '' className: '' @@ -709,9 +1037,9 @@ display: popupAnchor: x: '' 'y': '' - html: '
' + html: '
[node:field_map_marker:icon]
' html_class: leaflet-map-divicon - circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}' + circle_marker_options: '{"radius":5,"color":"{{ views_conditional_field }}","fillColor":"{{ views_conditional_field }}","fillOpacity":0.5}' fullscreen: control: false options: '{"position":"topleft","pseudoFullscreen":false}' @@ -731,12 +1059,16 @@ display: popup: false options: '' row: - type: 'entity:node' + type: fields options: - view_mode: teaser + default_field_elements: true + inline: { } + separator: '' + hide_empty: false defaults: style: false row: false + fields: false filters: false filter_groups: false display_description: '' @@ -752,6 +1084,8 @@ display: - user.permissions tags: - 'config:field.storage.node.field_geofield' + - 'config:field.storage.node.field_incube' + - 'config:field.storage.node.field_photo' block_3: id: block_3 display_title: 'Projets incubés Block' @@ -1091,3 +1425,4 @@ display: - user.permissions tags: - 'config:field.storage.node.field_geofield' + - 'config:field.storage.node.field_incube' diff --git a/web/themes/custom/eql/css-compiled/styles.css b/web/themes/custom/eql/css-compiled/styles.css index ce38ea1..b3ca429 100644 --- a/web/themes/custom/eql/css-compiled/styles.css +++ b/web/themes/custom/eql/css-compiled/styles.css @@ -728,7 +728,7 @@ a { .path-node.page-node-type-actualite .layout--threecol-25-50-25 .layout__region--top .block-region-top { display: flex; flex-direction: column; } } - .path-node.page-node-type-actualite .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-block-contentacfaf4e3-d7d0-42a6-a2a6-3c6ccd0e9344 { + .path-node.page-node-type-actualite .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-block-contente6f826c7-4a3e-479b-8e83-2245dee7f931 { grid-column: 1 / span 10; width: 100%; font-family: 'Source Code Pro'; @@ -741,6 +741,8 @@ a { padding-top: 1rem; padding-bottom: 0.5rem; vertical-align: middle; } + .path-node.page-node-type-actualite .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-block-contente6f826c7-4a3e-479b-8e83-2245dee7f931 a { + color: white; } .path-node.page-node-type-actualite .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-entity-fieldnodefield-actu-type { padding-top: 2rem; grid-column: 2; } @@ -3178,9 +3180,10 @@ a { font-family: 'Source Code Pro'; font-size: 2rem; font-weight: 800; - color: white; text-transform: uppercase; margin-left: 10%; } + .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-block-contentbfb4368c-4f85-4329-88f1-8769161aa66f .field--name-body a { + color: white; } .path-node.page-node-type-projet .layout-content .region-content #block-contenudelapageprincipale .layout--threecol-25-50-25 .layout__region--top .block-region-top .block-entity-fieldnodefield-adresse { margin-top: 3rem; grid-column: 2 / span 10; } @@ -3811,7 +3814,7 @@ a { background-color: white; padding-bottom: 0.8rem; max-width: inherit; - width: 200px; + width: 220px; align-items: center; height: 20px; } #header-top .region-header-top-left ul li a { diff --git a/web/themes/custom/eql/scss/pages/_actualite.scss b/web/themes/custom/eql/scss/pages/_actualite.scss index e9e8316..beb2c9c 100644 --- a/web/themes/custom/eql/scss/pages/_actualite.scss +++ b/web/themes/custom/eql/scss/pages/_actualite.scss @@ -27,7 +27,7 @@ display: flex; flex-direction: column; } - .block-block-contentacfaf4e3-d7d0-42a6-a2a6-3c6ccd0e9344{ + .block-block-contente6f826c7-4a3e-479b-8e83-2245dee7f931{ grid-column: 1 / span 10; width: 100%; font-family: 'Source Code Pro'; @@ -40,6 +40,9 @@ padding-top: 1rem; padding-bottom: 0.5rem; vertical-align: middle; + a{ + color:white; + } } .block-entity-fieldnodefield-actu-type{ diff --git a/web/themes/custom/eql/scss/pages/_projet.scss b/web/themes/custom/eql/scss/pages/_projet.scss index 36e2fde..dcc303f 100644 --- a/web/themes/custom/eql/scss/pages/_projet.scss +++ b/web/themes/custom/eql/scss/pages/_projet.scss @@ -30,9 +30,11 @@ font-family: 'Source Code Pro'; font-size: 2rem; font-weight: 800; - color: $white; text-transform: uppercase; margin-left: 10%; + a{ + color:$white; + } } } diff --git a/web/themes/custom/eql/scss/partials/_header.scss b/web/themes/custom/eql/scss/partials/_header.scss index 3b04965..acab939 100644 --- a/web/themes/custom/eql/scss/partials/_header.scss +++ b/web/themes/custom/eql/scss/partials/_header.scss @@ -114,7 +114,7 @@ background-color: $white; padding-bottom: 0.8rem; max-width: inherit; - width: 200px; + width: 220px; align-items: center; // padding-left: 1rem; height: 20px;