diff --git a/composer.json b/composer.json index 37e5ede0..c3482879 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "drupal/leaflet": "^2.1", "drupal/leaflet_more_maps": "^2.1", "drupal/leaflet_more_markers": "^1.1", + "drupal/linked_field": "^1.3", "drupal/migrate_devel": "2.x-dev@dev", "drupal/migrate_plus": "^5.1", "drupal/migrate_tools": "5.x-dev@dev", diff --git a/composer.lock b/composer.lock index f981ca48..720924ae 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": "60ec9cf473a30efc4da051a5713a0a02", + "content-hash": "328b7f6a32c6d7ca83f1be7cf6b6435a", "packages": [ { "name": "ajgl/breakpoint-twig-extension", @@ -6773,6 +6773,54 @@ "source": "https://git.drupalcode.org/project/link_attributes" } }, + { + "name": "drupal/linked_field", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/linked_field.git", + "reference": "8.x-1.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/linked_field-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "0350c415eba6ff63d9fc8f3a162564dd4c2142e2" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.3", + "datestamp": "1583855735", + "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": "hubdrop", + "homepage": "https://www.drupal.org/user/2750597" + }, + { + "name": "yannickoo", + "homepage": "https://www.drupal.org/user/531118" + } + ], + "description": "Adds the functionality to link fields to a specific destination.", + "homepage": "https://www.drupal.org/project/linked_field", + "support": { + "source": "https://git.drupalcode.org/project/linked_field" + } + }, { "name": "drupal/linkit", "version": "5.0.0-beta12", diff --git a/config/sync/block.block.identitedusite.yml b/config/sync/block.block.identitedusite.yml index ef46fb77..248a2d33 100644 --- a/config/sync/block.block.identitedusite.yml +++ b/config/sync/block.block.identitedusite.yml @@ -10,7 +10,7 @@ dependencies: id: identitedusite theme: popsu region: header_top_left -weight: 0 +weight: -4 provider: null plugin: system_branding_block settings: diff --git a/config/sync/block.block.logogouv.yml b/config/sync/block.block.logogouv.yml new file mode 100644 index 00000000..372429db --- /dev/null +++ b/config/sync/block.block.logogouv.yml @@ -0,0 +1,30 @@ +uuid: 98cced88-96ab-4187-bf85-9d9c6d087dad +langcode: fr +status: true +dependencies: + content: + - 'block_content:logo_block:68fcdff8-7b8c-4414-a84b-6ce173b5dc8b' + module: + - block_content + - system + theme: + - popsu +id: logogouv +theme: popsu +region: header_top_left +weight: -7 +provider: null +plugin: 'block_content:68fcdff8-7b8c-4414-a84b-6ce173b5dc8b' +settings: + id: 'block_content:68fcdff8-7b8c-4414-a84b-6ce173b5dc8b' + label: 'logo gouv full' + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: + request_path: + id: request_path + pages: '' + negate: false diff --git a/config/sync/block.block.logogouvcartouche.yml b/config/sync/block.block.logogouvcartouche.yml new file mode 100644 index 00000000..b92b0775 --- /dev/null +++ b/config/sync/block.block.logogouvcartouche.yml @@ -0,0 +1,30 @@ +uuid: 9dc169ba-d351-4f91-8301-7ebd851d33e5 +langcode: fr +status: true +dependencies: + content: + - 'block_content:logo_block:949c5592-687e-452d-9c85-17ab62f166c1' + module: + - block_content + - system + theme: + - popsu +id: logogouvcartouche +theme: popsu +region: header_top_left +weight: -6 +provider: null +plugin: 'block_content:949c5592-687e-452d-9c85-17ab62f166c1' +settings: + id: 'block_content:949c5592-687e-452d-9c85-17ab62f166c1' + label: 'logo gouv cartouche' + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: + request_path: + id: request_path + pages: '' + negate: true diff --git a/config/sync/block.block.logopuca.yml b/config/sync/block.block.logopuca.yml new file mode 100644 index 00000000..4863d39b --- /dev/null +++ b/config/sync/block.block.logopuca.yml @@ -0,0 +1,30 @@ +uuid: eba5d343-685c-4271-9243-cf6c308d2a60 +langcode: fr +status: true +dependencies: + content: + - 'block_content:logo_block:52af228a-19dd-4eb5-bce4-6d7b3e4acff1' + module: + - block_content + - system + theme: + - popsu +id: logopuca +theme: popsu +region: header_top_left +weight: -5 +provider: null +plugin: 'block_content:52af228a-19dd-4eb5-bce4-6d7b3e4acff1' +settings: + id: 'block_content:52af228a-19dd-4eb5-bce4-6d7b3e4acff1' + label: 'logo puca' + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: + request_path: + id: request_path + pages: '' + negate: false diff --git a/config/sync/block_content.type.logo_block.yml b/config/sync/block_content.type.logo_block.yml new file mode 100644 index 00000000..2973d27a --- /dev/null +++ b/config/sync/block_content.type.logo_block.yml @@ -0,0 +1,8 @@ +uuid: 1e33c9e4-5103-4e65-88b4-bb3c290a43e3 +langcode: fr +status: true +dependencies: { } +id: logo_block +label: 'logo block' +revision: 0 +description: '' diff --git a/config/sync/core.entity_form_display.block_content.logo_block.default.yml b/config/sync/core.entity_form_display.block_content.logo_block.default.yml new file mode 100644 index 00000000..59b8e31d --- /dev/null +++ b/config/sync/core.entity_form_display.block_content.logo_block.default.yml @@ -0,0 +1,49 @@ +uuid: 18dd32df-9d6d-4302-a6cd-b9cd120adc38 +langcode: fr +status: true +dependencies: + config: + - block_content.type.logo_block + - field.field.block_content.logo_block.field_link + - field.field.block_content.logo_block.field_logo + - image.style.thumbnail + module: + - image + - link +id: block_content.logo_block.default +targetEntityType: block_content +bundle: logo_block +mode: default +content: + field_link: + weight: 27 + settings: + placeholder_url: '' + placeholder_title: '' + third_party_settings: { } + type: link_default + region: content + field_logo: + weight: 28 + settings: + progress_indicator: throbber + preview_image_style: thumbnail + third_party_settings: { } + type: image_image + region: content + info: + type: string_textfield + weight: -5 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + langcode: + type: language_select + weight: 2 + region: content + settings: + include_locked: true + third_party_settings: { } +hidden: { } diff --git a/config/sync/core.entity_view_display.block_content.logo_block.default.yml b/config/sync/core.entity_view_display.block_content.logo_block.default.yml new file mode 100644 index 00000000..55779735 --- /dev/null +++ b/config/sync/core.entity_view_display.block_content.logo_block.default.yml @@ -0,0 +1,35 @@ +uuid: a1ef1878-f85b-4468-866f-98ad307a304b +langcode: fr +status: true +dependencies: + config: + - block_content.type.logo_block + - field.field.block_content.logo_block.field_link + - field.field.block_content.logo_block.field_logo + module: + - image + - linked_field +id: block_content.logo_block.default +targetEntityType: block_content +bundle: logo_block +mode: default +content: + field_logo: + weight: 0 + label: visually_hidden + settings: + image_style: '' + image_link: '' + third_party_settings: + linked_field: + linked: '1' + type: field + destination: field_link + advanced: { } + token: '' + type: image + region: content +hidden: + field_link: true + langcode: true + search_api_excerpt: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9e85fb44..5436bf4b 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -147,6 +147,7 @@ module: content_translation: 10 views: 10 paragraphs: 11 + linked_field: 100 figli_starter_kit: 1000 theme: seven: 0 diff --git a/config/sync/field.field.block_content.logo_block.field_link.yml b/config/sync/field.field.block_content.logo_block.field_link.yml new file mode 100644 index 00000000..ab334a65 --- /dev/null +++ b/config/sync/field.field.block_content.logo_block.field_link.yml @@ -0,0 +1,23 @@ +uuid: 236a2d2e-d7a9-4c3b-ad31-3d7d22d78070 +langcode: fr +status: true +dependencies: + config: + - block_content.type.logo_block + - field.storage.block_content.field_link + module: + - link +id: block_content.logo_block.field_link +field_name: field_link +entity_type: block_content +bundle: logo_block +label: link +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + link_type: 16 + title: 0 +field_type: link diff --git a/config/sync/field.field.block_content.logo_block.field_logo.yml b/config/sync/field.field.block_content.logo_block.field_logo.yml new file mode 100644 index 00000000..9d821c01 --- /dev/null +++ b/config/sync/field.field.block_content.logo_block.field_logo.yml @@ -0,0 +1,38 @@ +uuid: f36f529a-13bf-4abe-a7c3-ddb4809c2114 +langcode: fr +status: true +dependencies: + config: + - block_content.type.logo_block + - field.storage.block_content.field_logo + module: + - image +id: block_content.logo_block.field_logo +field_name: field_logo +entity_type: block_content +bundle: logo_block +label: logo +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'svg png gif jpg jpeg' + max_filesize: '' + max_resolution: '' + min_resolution: '' + alt_field: true + alt_field_required: true + title_field: true + title_field_required: false + default_image: + uuid: '' + alt: '' + title: '' + width: null + height: null + handler: 'default:file' + handler_settings: { } +field_type: image diff --git a/config/sync/field.storage.block_content.field_link.yml b/config/sync/field.storage.block_content.field_link.yml new file mode 100644 index 00000000..0118b7d6 --- /dev/null +++ b/config/sync/field.storage.block_content.field_link.yml @@ -0,0 +1,19 @@ +uuid: 0fb07a2a-e4ef-46e4-b761-94e5d5624284 +langcode: fr +status: true +dependencies: + module: + - block_content + - link +id: block_content.field_link +field_name: field_link +entity_type: block_content +type: link +settings: { } +module: link +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.block_content.field_logo.yml b/config/sync/field.storage.block_content.field_logo.yml new file mode 100644 index 00000000..9ca7aec4 --- /dev/null +++ b/config/sync/field.storage.block_content.field_logo.yml @@ -0,0 +1,30 @@ +uuid: 7b600369-dc2d-4f60-908a-f674c41c312c +langcode: fr +status: true +dependencies: + module: + - block_content + - file + - image +id: block_content.field_logo +field_name: field_logo +entity_type: block_content +type: image +settings: + uri_scheme: public + default_image: + uuid: '' + alt: '' + title: '' + width: null + height: null + target_type: file + display_field: false + display_default: false +module: image +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/language.content_settings.block_content.logo_block.yml b/config/sync/language.content_settings.block_content.logo_block.yml new file mode 100644 index 00000000..a6cbfcdf --- /dev/null +++ b/config/sync/language.content_settings.block_content.logo_block.yml @@ -0,0 +1,11 @@ +uuid: 3de40503-8d60-4f51-af44-eabf5bfe873b +langcode: fr +status: true +dependencies: + config: + - block_content.type.logo_block +id: block_content.logo_block +target_entity_type_id: block_content +target_bundle: logo_block +default_langcode: site_default +language_alterable: false diff --git a/config/sync/linked_field.config.yml b/config/sync/linked_field.config.yml new file mode 100644 index 00000000..1474a392 --- /dev/null +++ b/config/sync/linked_field.config.yml @@ -0,0 +1,16 @@ +attributes: + title: + label: '' + description: '' + target: + label: '' + description: '' + class: + label: '' + description: '' + rel: + label: Relationship + description: '' +_core: + default_config_hash: PQasQC1X7aWGPpdeZMscZrE9K0RnK_czZQedrwTJor8 +langcode: fr diff --git a/config/sync/smart_date.smart_date_format.default.yml b/config/sync/smart_date.smart_date_format.default.yml index df52dafd..d9a6af82 100644 --- a/config/sync/smart_date.smart_date_format.default.yml +++ b/config/sync/smart_date.smart_date_format.default.yml @@ -6,7 +6,7 @@ _core: default_config_hash: QOzaA8j2871_aWBJyVZm_LqREilQnXZqRuk3HNANrEo id: default label: défaut -date_format: 'D, M j Y' +date_format: 'D j M Y' time_format: 'g:ia' time_hour_format: ga allday_label: 'All day'