From 23978bb492d5da694e82578740a3e684d6591387 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 2 Dec 2021 20:35:52 +0100 Subject: [PATCH 1/3] starter profile --- web/profiles/d8-starterkit-profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 6fe8986..9b46db9 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 6fe8986494069c7e9bf019cbe98d8f2c7d5166d0 +Subproject commit 9b46db9c56faf2cbc965ea1b76ce5345e7f46c0f From 9b2639b3b2c8f90e0298ab481e6825ea4c397f63 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 2 Dec 2021 20:48:32 +0100 Subject: [PATCH 2/3] more permissions to editors --- config/sync/user.role.editeur.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/user.role.editeur.yml b/config/sync/user.role.editeur.yml index dad1d2d..43d7fd0 100644 --- a/config/sync/user.role.editeur.yml +++ b/config/sync/user.role.editeur.yml @@ -9,6 +9,7 @@ is_admin: null permissions: - 'access administration pages' - 'access content overview' + - 'access toolbar' - 'administer nodes' - 'create actualite content' - 'create evenement content' From 116bc8d0bf16d890f90497ac8fd8e6570ef6e133 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 2 Dec 2021 21:04:12 +0100 Subject: [PATCH 3/3] field_image_caption --- composer.json | 1 + composer.lock | 63 ++++++++++++++++++- ...ty_view_display.node.actualite.default.yml | 9 ++- ...ty_view_display.node.ressource.default.yml | 4 +- ...ntity_view_display.node.static.default.yml | 22 +++++-- config/sync/core.extension.yml | 1 + ...ield.field.node.actualite.field_images.yml | 3 + ...ield.field.node.ressource.field_images.yml | 3 + .../field.field.node.static.field_images.yml | 3 + ...age_variant.node_view-panels_variant-0.yml | 6 +- 10 files changed, 97 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 825f490..f0706d3 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "drupal/entity_type_clone": "^1.7", "drupal/formatter_suite": "^1.3", "drupal/image_delta_formatter": "^1.1", + "drupal/image_field_caption": "^1.1", "drupal/linked_field": "^1.3", "drupal/manage_display": "1.x-dev@dev", "drupal/page_manager": "4.x-dev@dev", diff --git a/composer.lock b/composer.lock index fa4dfa0..87cea39 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": "f6ce8b14799a226358cd1722b1ef8b12", + "content-hash": "e8f2cca0910fab607b4b5e7940909798", "packages": [ { "name": "alchemy/zippy", @@ -5546,6 +5546,67 @@ "source": "https://git.drupalcode.org/project/image_delta_formatter" } }, + { + "name": "drupal/image_field_caption", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/image_field_caption.git", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/image_field_caption-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "d4a67a81d4cd4d4fde6f342325c79862a4305a0b" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.1", + "datestamp": "1602264818", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "awm", + "homepage": "https://www.drupal.org/user/1059398" + }, + { + "name": "hanoii", + "homepage": "https://www.drupal.org/user/23157" + }, + { + "name": "iStryker", + "homepage": "https://www.drupal.org/user/303676" + }, + { + "name": "ironsizide", + "homepage": "https://www.drupal.org/user/787980" + }, + { + "name": "tyler.frankenstein", + "homepage": "https://www.drupal.org/user/150680" + } + ], + "description": "Add caption to image field.", + "homepage": "https://www.drupal.org/project/image_field_caption", + "support": { + "source": "https://git.drupalcode.org/project/image_field_caption", + "issues": "https://www.drupal.org/project/issues/image_field_caption" + } + }, { "name": "drupal/imagemagick", "version": "3.2.0", diff --git a/config/sync/core.entity_view_display.node.actualite.default.yml b/config/sync/core.entity_view_display.node.actualite.default.yml index 0121f44..cb0c22c 100644 --- a/config/sync/core.entity_view_display.node.actualite.default.yml +++ b/config/sync/core.entity_view_display.node.actualite.default.yml @@ -11,11 +11,12 @@ dependencies: - field.field.node.actualite.field_liens - field.field.node.actualite.field_ress - field.field.node.actualite.field_sous_titre + - image.style.wide - node.type.actualite module: - datetime - file - - image_delta_formatter + - image_field_caption - link - manage_display - text @@ -60,12 +61,10 @@ content: weight: 0 label: hidden settings: - deltas: '0' - image_style: '' + image_style: wide image_link: '' - deltas_reversed: '0' third_party_settings: { } - type: image_delta_formatter + type: image_caption region: content field_liens: weight: 7 diff --git a/config/sync/core.entity_view_display.node.ressource.default.yml b/config/sync/core.entity_view_display.node.ressource.default.yml index 42da6cd..11a6201 100644 --- a/config/sync/core.entity_view_display.node.ressource.default.yml +++ b/config/sync/core.entity_view_display.node.ressource.default.yml @@ -22,7 +22,7 @@ dependencies: - datetime - entity_reference_revisions - file - - image + - image_field_caption - link - manage_display - text @@ -86,7 +86,7 @@ content: image_style: '' image_link: '' third_party_settings: { } - type: image + type: image_caption region: content field_liens: weight: 9 diff --git a/config/sync/core.entity_view_display.node.static.default.yml b/config/sync/core.entity_view_display.node.static.default.yml index bbf81cf..7cd2c2e 100644 --- a/config/sync/core.entity_view_display.node.static.default.yml +++ b/config/sync/core.entity_view_display.node.static.default.yml @@ -13,10 +13,12 @@ dependencies: - field.field.node.static.field_ress - field.field.node.static.field_textes - field.field.node.static.field_videos + - image.style.wide - node.type.static module: - entity_reference_revisions - file + - image_field_caption - link - manage_display - video_embed_field @@ -35,6 +37,15 @@ content: third_party_settings: { } type: file_default region: content + field_images: + type: image_caption + weight: 4 + region: content + label: above + settings: + image_style: wide + image_link: '' + third_party_settings: { } field_liens: weight: 2 label: above @@ -48,7 +59,7 @@ content: type: link region: content field_page_statique_liees: - weight: 7 + weight: 8 label: above settings: link: true @@ -57,7 +68,7 @@ content: region: content field_partenaires: type: entity_reference_revisions_entity_view - weight: 5 + weight: 6 label: above settings: view_mode: default @@ -66,7 +77,7 @@ content: region: content field_personnes: type: entity_reference_revisions_entity_view - weight: 6 + weight: 7 label: above settings: view_mode: default @@ -74,7 +85,7 @@ content: third_party_settings: { } region: content field_ress: - weight: 8 + weight: 9 label: above settings: link: true @@ -83,7 +94,7 @@ content: region: content field_textes: type: entity_reference_revisions_entity_view - weight: 4 + weight: 5 label: above settings: view_mode: default @@ -113,7 +124,6 @@ content: hidden: created: true field_accroche: true - field_images: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index a7aa5e5..ace38e0 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -56,6 +56,7 @@ module: honeypot: 0 image: 0 image_delta_formatter: 0 + image_field_caption: 0 inline_entity_form: 0 jquery_ui: 0 jquery_ui_button: 0 diff --git a/config/sync/field.field.node.actualite.field_images.yml b/config/sync/field.field.node.actualite.field_images.yml index ef5a926..af847eb 100644 --- a/config/sync/field.field.node.actualite.field_images.yml +++ b/config/sync/field.field.node.actualite.field_images.yml @@ -33,6 +33,9 @@ settings: title: '' width: null height: null + caption: '' + caption_field: 1 + caption_field_required: 0 handler: 'default:file' handler_settings: { } field_type: image diff --git a/config/sync/field.field.node.ressource.field_images.yml b/config/sync/field.field.node.ressource.field_images.yml index 4f5864a..7e4751b 100644 --- a/config/sync/field.field.node.ressource.field_images.yml +++ b/config/sync/field.field.node.ressource.field_images.yml @@ -40,6 +40,9 @@ settings: title: '' width: null height: null + caption: '' + caption_field: 1 + caption_field_required: 0 handler: 'default:file' handler_settings: { } field_type: image diff --git a/config/sync/field.field.node.static.field_images.yml b/config/sync/field.field.node.static.field_images.yml index 1ed0264..10d871b 100644 --- a/config/sync/field.field.node.static.field_images.yml +++ b/config/sync/field.field.node.static.field_images.yml @@ -40,6 +40,9 @@ settings: title: '' width: null height: null + caption: '' + caption_field: 1 + caption_field_required: 0 handler: 'default:file' handler_settings: { } field_type: image diff --git a/config/sync/page_manager.page_variant.node_view-panels_variant-0.yml b/config/sync/page_manager.page_variant.node_view-panels_variant-0.yml index d1e6583..f8f7999 100644 --- a/config/sync/page_manager.page_variant.node_view-panels_variant-0.yml +++ b/config/sync/page_manager.page_variant.node_view-panels_variant-0.yml @@ -122,12 +122,10 @@ variant_settings: label_display: '0' formatter: label: hidden - type: image_delta_formatter + type: image_caption settings: - image_style: large + image_style: wide image_link: '' - deltas: '0' - deltas_reversed: 0 third_party_settings: { } weight: 0 region: top