diff --git a/src/composer.json b/src/composer.json index c76a504..da0eef0 100644 --- a/src/composer.json +++ b/src/composer.json @@ -19,6 +19,7 @@ "drupal/address": "^1", "drupal/admin_toolbar_content": "^1.3", "drupal/administerusersbyrole": "^3.3", + "drupal/allowed_formats": "^2.0", "drupal/amswap": "^3", "drupal/audiofield": "1.x-dev@dev", "drupal/auto_entitylabel": "^3.0", @@ -30,6 +31,7 @@ "drupal/core-project-message": "^9", "drupal/core-recommended": "^9", "drupal/entity_limit": "^2.0@alpha", + "drupal/epp": "^1.5", "drupal/field_hidden": "^2.0", "drupal/flexible_permissions": "@beta", "drupal/genpass": "^1.1", @@ -37,9 +39,10 @@ "drupal/group": "3.0.x-dev@dev", "drupal/hide_revision_field": "^2.2", "drupal/mail_login": "^2.6", + "drupal/manage_display": "^3.0@RC", "drupal/paragraphs": "^1.15", "drupal/paragraphs_modal_edit": "^1.1", - "drupal/prepopulate": "^2.4", + "drupal/readonly_field_widget": "^1.5", "drupal/regcode": "^1.1", "drupal/restui": "^1.21", "drupal/role_delegation": "^1.2", diff --git a/src/composer.lock b/src/composer.lock index 856ac0b..b2143bc 100644 --- a/src/composer.lock +++ b/src/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": "ef8573820b719325e4b4449166687561", + "content-hash": "b22ced6a38f98c413636049595ba7ec0", "packages": [ { "name": "alchemy/zippy", @@ -2580,6 +2580,67 @@ "source": "https://git.drupalcode.org/project/advanced_text_formatter" } }, + { + "name": "drupal/allowed_formats", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/allowed_formats.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/allowed_formats-2.0.0.zip", + "reference": "2.0.0", + "shasum": "ac6c6d398f303608ced7e9cd9d4556a728dc41f0" + }, + "require": { + "drupal/core": "^9.2 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1669170410", + "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": "Northern Commerce (formerly Digital Echidna)", + "homepage": "https://www.drupal.org/northern-commerce-formerly-digital-echidna", + "role": "Supporting organization" + }, + { + "name": "Jordan Thompson (nord102)", + "homepage": "https://www.drupal.org/u/nord102", + "role": "Maintainer" + }, + { + "name": "Wunder", + "homepage": "https://www.drupal.org/wunder", + "role": "Supporting organization" + }, + { + "name": "Florian Loretan (floretan)", + "homepage": "https://www.drupal.org/u/floretan", + "role": "Maintainer" + } + ], + "description": "Limit which text formats are available for each field instance.", + "homepage": "https://www.drupal.org/project/allowed_formats", + "support": { + "source": "http://cgit.drupalcode.org/allowed_formats", + "issues": "https://www.drupal.org/project/issues/allowed_formats" + } + }, { "name": "drupal/amswap", "version": "3.2.1", @@ -5539,6 +5600,58 @@ "source": "https://git.drupalcode.org/project/entity_reference_revisions" } }, + { + "name": "drupal/epp", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/epp.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/epp-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "54260bfa2330d36e0dc2d7c6c4574e4b5f084042" + }, + "require": { + "drupal/core": "^8.7.7 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.5", + "datestamp": "1679356317", + "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": "anruether", + "homepage": "https://www.drupal.org/user/894458" + }, + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "heliogabal", + "homepage": "https://www.drupal.org/user/998658" + } + ], + "description": "Prepopulate entity values via tokens. Install the Token module for more tokens and Token browser access.", + "homepage": "https://www.drupal.org/project/epp", + "support": { + "source": "https://git.drupalcode.org/project/epp" + } + }, { "name": "drupal/extlink", "version": "1.7.0", @@ -7180,6 +7293,50 @@ "source": "https://git.drupalcode.org/project/maillog" } }, + { + "name": "drupal/manage_display", + "version": "3.0.0-rc1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/manage_display.git", + "reference": "3.0.0-rc1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/manage_display-3.0.0-rc1.zip", + "reference": "3.0.0-rc1", + "shasum": "b8e56b380604e5080d1067c4190f1507d4a21b64" + }, + "require": { + "drupal/core": "^9.4 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.0-rc1", + "datestamp": "1679399351", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "AdamPS", + "homepage": "https://www.drupal.org/user/2650563" + } + ], + "description": "Make base fields such as 'title' available in \"Manage Display\"", + "homepage": "https://www.drupal.org/project/manage_display", + "support": { + "source": "https://git.drupalcode.org/project/manage_display" + } + }, { "name": "drupal/matomo", "version": "1.19.0", @@ -7952,74 +8109,6 @@ "issues": "https://www.drupal.org/project/issues/persistent_login" } }, - { - "name": "drupal/prepopulate", - "version": "2.4.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/prepopulate.git", - "reference": "8.x-2.4" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/prepopulate-8.x-2.4.zip", - "reference": "8.x-2.4", - "shasum": "5e82bd6cbbaafc8320e8b3e48bc3862de4964e00" - }, - "require": { - "drupal/core": "^8 || ^9 || ^10" - }, - "require-dev": { - "drupal/inline_entity_form": "^1.0@beta", - "drupal/og": "^1.0@alpha" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-2.4", - "datestamp": "1678728834", - "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": "Heddn", - "homepage": "https://www.drupal.org/u/heddn", - "role": "Maintainer" - }, - { - "name": "Jbrauer", - "homepage": "https://www.drupal.org/u/jbrauer", - "role": "Maintainer" - }, - { - "name": "Eafarris", - "homepage": "https://www.drupal.org/u/eafarris", - "role": "Maintainer" - }, - { - "name": "FF1", - "homepage": "https://www.drupal.org/u/ff1", - "role": "Maintainer" - } - ], - "description": "Allows form elements to be prepopulated from the URL.", - "homepage": "https://www.drupal.org/project/prepopulate", - "keywords": [ - "Drupal" - ], - "support": { - "source": "https://git.drupalcode.org/project/prepopulate", - "issues": "https://www.drupal.org/project/issues/prepopulate" - } - }, { "name": "drupal/profile", "version": "1.4.0", @@ -8088,6 +8177,50 @@ "source": "https://git.drupalcode.org/project/profile" } }, + { + "name": "drupal/readonly_field_widget", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/readonly_field_widget.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/readonly_field_widget-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "936bfb182d2c406501fb279dd3977d4c29113c3f" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.5", + "datestamp": "1660464949", + "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": "thtas", + "homepage": "https://www.drupal.org/user/287467" + } + ], + "description": "Provides a field widget which can display the field formatter version of a field on the edit form", + "homepage": "https://www.drupal.org/project/readonly_field_widget", + "support": { + "source": "https://git.drupalcode.org/project/readonly_field_widget" + } + }, { "name": "drupal/redirect", "version": "1.8.0", @@ -15063,6 +15196,7 @@ "drupal/flexible_permissions": 10, "drupal/graphql": 20, "drupal/group": 20, + "drupal/manage_display": 5, "drupal/typed_data": 20, "drupal/bulkdelete": 20, "drupal/cshs": 20, diff --git a/src/config/sync/auto_entitylabel.settings.node.reponse.yml b/src/config/sync/auto_entitylabel.settings.node.reponse.yml index 6626d9d..0460a33 100644 --- a/src/config/sync/auto_entitylabel.settings.node.reponse.yml +++ b/src/config/sync/auto_entitylabel.settings.node.reponse.yml @@ -1,8 +1,8 @@ status: 1 -pattern: 'reponse-[node:field_besoin:entity:title]-[random:hash:sha1]' +pattern: 'reponse-[node:field_besoin_on_reponses:entity:title]-[random:hash:sha1]' escape: false preserve_titles: false -save: false +save: true chunk: 50 dependencies: config: diff --git a/src/config/sync/cer.corresponding_reference.besoin_reponse.yml b/src/config/sync/cer.corresponding_reference.besoin_reponse.yml index 2b8b596..221f52b 100644 --- a/src/config/sync/cer.corresponding_reference.besoin_reponse.yml +++ b/src/config/sync/cer.corresponding_reference.besoin_reponse.yml @@ -5,8 +5,8 @@ dependencies: { } id: besoin_reponse label: 'besoin reponse' enabled: true -first_field: field_besoin -second_field: field_reponse +first_field: field_reponse +second_field: field_besoin_on_reponses add_direction: append bundles: node: diff --git a/src/config/sync/core.entity_form_display.node.besoin.default.yml b/src/config/sync/core.entity_form_display.node.besoin.default.yml index 0ea6a4e..068a43e 100644 --- a/src/config/sync/core.entity_form_display.node.besoin.default.yml +++ b/src/config/sync/core.entity_form_display.node.besoin.default.yml @@ -11,6 +11,7 @@ dependencies: module: - field_group - field_hidden + - readonly_field_widget - text third_party_settings: field_group: @@ -92,14 +93,31 @@ content: placeholder: '' third_party_settings: { } field_reponse: - type: entity_reference_autocomplete + type: readonly_field_widget weight: 3 region: content settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + label: hidden + formatter_type: entity_reference_entity_view + formatter_settings: + entity_reference_entity_view: + view_mode: reponse_on_besoin + entity_reference_label: + link: true + formatter_suite_general_entity_reference: + entityReferenceStyle: title + titleCustomText: '' + classes: '' + showLink: '1' + openLinkIn: _self + linkTopic: any + listStyle: span + listSeparator: ', ' + formatter_suite_entity_reference_render_list: + view_mode: default + listStyle: span + listSeparator: ',' + show_description: false third_party_settings: { } title: type: string_textfield diff --git a/src/config/sync/core.entity_form_display.node.entite.default.yml b/src/config/sync/core.entity_form_display.node.entite.default.yml index 2d33332..a922e80 100644 --- a/src/config/sync/core.entity_form_display.node.entite.default.yml +++ b/src/config/sync/core.entity_form_display.node.entite.default.yml @@ -27,7 +27,7 @@ third_party_settings: label: Details region: content parent_name: '' - weight: 1 + weight: 2 format_type: details_sidebar format_settings: classes: '' @@ -40,13 +40,14 @@ third_party_settings: group_tabs: children: - group_contenu + - group_sources - group_superpositions - group_proximites - group_con label: Tabs region: content parent_name: '' - weight: 0 + weight: 1 format_type: tabs format_settings: classes: '' @@ -60,7 +61,6 @@ third_party_settings: - field_entite_agissante - field_action - field_menace_maintien - - field_sources label: Contenu region: content parent_name: group_tabs @@ -79,7 +79,7 @@ third_party_settings: label: Proximités region: content parent_name: group_tabs - weight: 15 + weight: 17 format_type: tab format_settings: classes: '' @@ -94,7 +94,7 @@ third_party_settings: label: Superpositions region: content parent_name: group_tabs - weight: 14 + weight: 16 format_type: tab format_settings: classes: '' @@ -109,7 +109,22 @@ third_party_settings: label: Confidentialité region: content parent_name: group_tabs - weight: 16 + weight: 18 + format_type: tab + format_settings: + classes: '' + show_empty_fields: false + id: '' + formatter: closed + description: '' + required_fields: true + group_sources: + children: + - field_sources + label: Sources + region: content + parent_name: group_tabs + weight: 15 format_type: tab format_settings: classes: '' @@ -134,18 +149,12 @@ content: weight: 2 region: content settings: - rows: 8 + rows: 5 placeholder: '' - third_party_settings: - maxlength: - maxlength_js: null - maxlength_js_label: 'Contenu limité à @limit caractères, restant : @remaining' - maxlength_js_enforce: false - advanced_text_formatter: - show_token_tree: 0 + third_party_settings: { } field_confidentialite: type: workflow_default - weight: 32 + weight: 1 region: content settings: { } third_party_settings: { } @@ -161,15 +170,9 @@ content: weight: 3 region: content settings: - rows: 8 + rows: 5 placeholder: '' - third_party_settings: - maxlength: - maxlength_js: null - maxlength_js_label: 'Contenu limité à @limit caractères, restant : @remaining' - maxlength_js_enforce: false - advanced_text_formatter: - show_token_tree: 0 + third_party_settings: { } field_proximite: type: entity_reference_autocomplete weight: 5 @@ -220,12 +223,13 @@ content: weight: 0 region: content settings: - size: 80 - placeholder: 'Pouvez-vous nommer par qui ou par quoi "CONCERNEMENT" est menacé ou maintenu ? ' + size: 40 + placeholder: '' third_party_settings: maxlength: maxlength_js: null maxlength_js_label: 'Contenu limité à @limit caractères, restant : @remaining' + maxlength_js_enforce: false advanced_text_formatter: show_token_tree: 0 uid: @@ -242,5 +246,6 @@ hidden: langcode: true path: true promote: true + revision_log: true sticky: true url_redirects: true diff --git a/src/config/sync/core.entity_form_display.node.reponse.default.yml b/src/config/sync/core.entity_form_display.node.reponse.default.yml index 8942935..1a487d7 100644 --- a/src/config/sync/core.entity_form_display.node.reponse.default.yml +++ b/src/config/sync/core.entity_form_display.node.reponse.default.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - field.field.node.reponse.field_avec - - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_besoin_on_reponses - field.field.node.reponse.field_ou - field.field.node.reponse.field_qui - field.field.node.reponse.field_quoi - node.type.reponse module: - conditional_fields + - readonly_field_widget - text id: node.reponse.default targetEntityType: node @@ -19,7 +20,7 @@ mode: default content: field_avec: type: text_textarea - weight: 3 + weight: 4 region: content settings: rows: 5 @@ -49,19 +50,34 @@ content: slide: speed: '400' selector: '' - field_besoin: - type: entity_reference_autocomplete - weight: 4 + field_besoin_on_reponses: + type: readonly_field_widget + weight: 0 region: content settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' + label: hidden + formatter_type: entity_reference_entity_view + formatter_settings: + entity_reference_entity_view: + view_mode: besoin_on_reponse_form + formatter_suite_general_entity_reference: + entityReferenceStyle: title + titleCustomText: '' + classes: '' + openLinkIn: _self + linkTopic: any + showLink: 0 + formatter_suite_entity_reference_render_list: + view_mode: default + listStyle: span + listSeparator: ',' + entity_reference_label: + link: false + show_description: false third_party_settings: { } field_ou: type: text_textarea - weight: 2 + weight: 3 region: content settings: rows: 5 @@ -93,7 +109,7 @@ content: selector: '' field_qui: type: text_textarea - weight: 0 + weight: 1 region: content settings: rows: 5 @@ -101,7 +117,7 @@ content: third_party_settings: { } field_quoi: type: text_textarea - weight: 1 + weight: 2 region: content settings: rows: 5 diff --git a/src/config/sync/core.entity_view_display.node.besoin.besoin_on_reponse_form.yml b/src/config/sync/core.entity_view_display.node.besoin.besoin_on_reponse_form.yml new file mode 100644 index 0000000..4454360 --- /dev/null +++ b/src/config/sync/core.entity_view_display.node.besoin.besoin_on_reponse_form.yml @@ -0,0 +1,43 @@ +uuid: 5241b500-38b1-4f4f-af04-157824436690 +langcode: fr +status: true +dependencies: + config: + - core.entity_view_mode.node.besoin_on_reponse_form + - field.field.node.besoin.body + - field.field.node.besoin.field_concernement + - field.field.node.besoin.field_index + - field.field.node.besoin.field_reponse + - node.type.besoin + module: + - text +id: node.besoin.besoin_on_reponse_form +targetEntityType: node +bundle: besoin +mode: besoin_on_reponse_form +content: + body: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_concernement: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: conecernement_on_reponse_form + link: false + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + field_index: true + field_reponse: true + langcode: true + links: true + search_api_excerpt: true + title: true + uid: true diff --git a/src/config/sync/core.entity_view_display.node.besoin.default.yml b/src/config/sync/core.entity_view_display.node.besoin.default.yml index 1db0bd5..cc92b20 100644 --- a/src/config/sync/core.entity_view_display.node.besoin.default.yml +++ b/src/config/sync/core.entity_view_display.node.besoin.default.yml @@ -21,24 +21,15 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 101 + weight: 1 region: content field_concernement: type: entity_reference_label - label: above + label: hidden settings: link: true third_party_settings: { } - weight: 102 - region: content - field_index: - type: number_integer - label: above - settings: - thousand_separator: '' - prefix_suffix: true - third_party_settings: { } - weight: 104 + weight: 0 region: content field_reponse: type: entity_reference_label @@ -46,13 +37,10 @@ content: settings: link: true third_party_settings: { } - weight: 103 - region: content - links: - settings: { } - third_party_settings: { } - weight: 100 + weight: 2 region: content hidden: + field_index: true langcode: true + links: true search_api_excerpt: true diff --git a/src/config/sync/core.entity_view_display.node.concernement.conecernement_on_reponse_form.yml b/src/config/sync/core.entity_view_display.node.concernement.conecernement_on_reponse_form.yml new file mode 100644 index 0000000..d8dee45 --- /dev/null +++ b/src/config/sync/core.entity_view_display.node.concernement.conecernement_on_reponse_form.yml @@ -0,0 +1,45 @@ +uuid: 3fdeaaad-38b3-4ebe-8c2d-6a56bf7af5ee +langcode: fr +status: true +dependencies: + config: + - core.entity_view_mode.node.conecernement_on_reponse_form + - field.field.node.concernement.field_besoin + - field.field.node.concernement.field_caillou + - field.field.node.concernement.field_confidentialite + - field.field.node.concernement.field_description + - field.field.node.concernement.field_doleancer + - field.field.node.concernement.field_entite + - field.field.node.concernement.field_lieu + - field.field.node.concernement.field_recit + - node.type.concernement + module: + - manage_display +id: node.concernement.conecernement_on_reponse_form +targetEntityType: node +bundle: concernement +mode: conecernement_on_reponse_form +content: + title: + type: title + label: hidden + settings: + link_to_entity: false + tag: h2 + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + field_besoin: true + field_caillou: true + field_confidentialite: true + field_description: true + field_doleancer: true + field_entite: true + field_lieu: true + field_recit: true + langcode: true + links: true + search_api_excerpt: true + uid: true diff --git a/src/config/sync/core.entity_view_display.node.concernement.default.yml b/src/config/sync/core.entity_view_display.node.concernement.default.yml index ea5b698..aae2651 100644 --- a/src/config/sync/core.entity_view_display.node.concernement.default.yml +++ b/src/config/sync/core.entity_view_display.node.concernement.default.yml @@ -15,8 +15,8 @@ dependencies: module: - entity_reference_revisions - file + - manage_display - options - - user id: node.concernement.default targetEntityType: node bundle: concernement @@ -90,6 +90,17 @@ content: third_party_settings: { } weight: 100 region: content + title: + type: title + label: hidden + settings: + link_to_entity: true + tag: h2 + third_party_settings: { } + weight: -49 + region: content hidden: + created: true langcode: true search_api_excerpt: true + uid: true diff --git a/src/config/sync/core.entity_view_display.node.reponse.default.yml b/src/config/sync/core.entity_view_display.node.reponse.default.yml index 47de564..80639d8 100644 --- a/src/config/sync/core.entity_view_display.node.reponse.default.yml +++ b/src/config/sync/core.entity_view_display.node.reponse.default.yml @@ -4,14 +4,14 @@ status: true dependencies: config: - field.field.node.reponse.field_avec - - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_besoin_on_reponses - field.field.node.reponse.field_ou - field.field.node.reponse.field_qui - field.field.node.reponse.field_quoi - node.type.reponse module: + - manage_display - text - - user id: node.reponse.default targetEntityType: node bundle: reponse @@ -24,13 +24,13 @@ content: third_party_settings: { } weight: 106 region: content - field_besoin: + field_besoin_on_reponses: type: entity_reference_label label: above settings: link: true third_party_settings: { } - weight: 102 + weight: 107 region: content field_ou: type: text_default @@ -58,6 +58,17 @@ content: third_party_settings: { } weight: 100 region: content + title: + type: title + label: hidden + settings: + link_to_entity: true + tag: h2 + third_party_settings: { } + weight: -49 + region: content hidden: + created: true langcode: true search_api_excerpt: true + uid: true diff --git a/src/config/sync/core.entity_view_display.node.reponse.reponse_on_besoin.yml b/src/config/sync/core.entity_view_display.node.reponse.reponse_on_besoin.yml new file mode 100644 index 0000000..ef72456 --- /dev/null +++ b/src/config/sync/core.entity_view_display.node.reponse.reponse_on_besoin.yml @@ -0,0 +1,71 @@ +uuid: 726f6621-a84a-4d9c-ab28-00d669f438ed +langcode: fr +status: true +dependencies: + config: + - core.entity_view_mode.node.reponse_on_besoin + - field.field.node.reponse.field_avec + - field.field.node.reponse.field_besoin_on_reponses + - field.field.node.reponse.field_ou + - field.field.node.reponse.field_qui + - field.field.node.reponse.field_quoi + - node.type.reponse + module: + - text +id: node.reponse.reponse_on_besoin +targetEntityType: node +bundle: reponse +mode: reponse_on_besoin +content: + created: + type: timestamp + label: inline + settings: + date_format: medium + custom_date_format: '' + timezone: '' + third_party_settings: { } + weight: 1 + region: content + field_avec: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 5 + region: content + field_ou: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + field_qui: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_quoi: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content + uid: + type: entity_reference_label + label: inline + settings: + link: false + third_party_settings: { } + weight: 0 + region: content +hidden: + field_besoin_on_reponses: true + langcode: true + links: true + search_api_excerpt: true + title: true diff --git a/src/config/sync/core.entity_view_display.node.reponse.teaser.yml b/src/config/sync/core.entity_view_display.node.reponse.teaser.yml index b5b4085..e7d1d7f 100644 --- a/src/config/sync/core.entity_view_display.node.reponse.teaser.yml +++ b/src/config/sync/core.entity_view_display.node.reponse.teaser.yml @@ -5,7 +5,7 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.reponse.field_avec - - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_besoin_on_reponses - field.field.node.reponse.field_ou - field.field.node.reponse.field_qui - field.field.node.reponse.field_quoi @@ -24,7 +24,7 @@ content: region: content hidden: field_avec: true - field_besoin: true + field_besoin_on_reponses: true field_ou: true field_qui: true field_quoi: true diff --git a/src/config/sync/core.entity_view_mode.node.besoin_on_reponse_form.yml b/src/config/sync/core.entity_view_mode.node.besoin_on_reponse_form.yml new file mode 100644 index 0000000..23bac4f --- /dev/null +++ b/src/config/sync/core.entity_view_mode.node.besoin_on_reponse_form.yml @@ -0,0 +1,10 @@ +uuid: 4febbdcd-34ea-45e3-9162-507812a251a6 +langcode: fr +status: true +dependencies: + module: + - node +id: node.besoin_on_reponse_form +label: 'besoin on reponse form' +targetEntityType: node +cache: true diff --git a/src/config/sync/core.entity_view_mode.node.conecernement_on_reponse_form.yml b/src/config/sync/core.entity_view_mode.node.conecernement_on_reponse_form.yml new file mode 100644 index 0000000..0b0f786 --- /dev/null +++ b/src/config/sync/core.entity_view_mode.node.conecernement_on_reponse_form.yml @@ -0,0 +1,10 @@ +uuid: e3948b92-8cb6-4bca-9471-83c621931b01 +langcode: fr +status: true +dependencies: + module: + - node +id: node.conecernement_on_reponse_form +label: 'conecernement on reponse form' +targetEntityType: node +cache: true diff --git a/src/config/sync/core.entity_view_mode.node.reponse_on_besoin.yml b/src/config/sync/core.entity_view_mode.node.reponse_on_besoin.yml new file mode 100644 index 0000000..2c70f56 --- /dev/null +++ b/src/config/sync/core.entity_view_mode.node.reponse_on_besoin.yml @@ -0,0 +1,10 @@ +uuid: 6f49a72e-b6a4-46a5-8295-ac01a4c2afe9 +langcode: fr +status: true +dependencies: + module: + - node +id: node.reponse_on_besoin +label: 'reponse on besoin form' +targetEntityType: node +cache: true diff --git a/src/config/sync/core.extension.yml b/src/config/sync/core.extension.yml index 3110ab5..1a10fc4 100644 --- a/src/config/sync/core.extension.yml +++ b/src/config/sync/core.extension.yml @@ -11,6 +11,7 @@ module: admin_toolbar_tools: 0 administerusersbyrole: 0 advanced_text_formatter: 0 + allowed_formats: 0 amswap: 0 audiofield: 0 auto_entitylabel: 0 @@ -56,6 +57,7 @@ module: entity_browser_enhanced: 0 entity_limit: 0 entity_reference_revisions: 0 + epp: 0 field: 0 field_group: 0 field_hidden: 0 @@ -88,6 +90,7 @@ module: linkit: 0 locale: 0 maillog: 0 + manage_display: 0 maxlength: 0 menu_block: 0 menu_link_content: 0 @@ -106,7 +109,7 @@ module: path_alias_xt: 0 pathologic: 0 persistent_login: 0 - prepopulate: 0 + readonly_field_widget: 0 redirect: 0 redis: 0 regcode: 0 diff --git a/src/config/sync/field.field.node.reponse.field_besoin.yml b/src/config/sync/field.field.node.reponse.field_besoin_on_reponses.yml similarity index 56% rename from src/config/sync/field.field.node.reponse.field_besoin.yml rename to src/config/sync/field.field.node.reponse.field_besoin_on_reponses.yml index 9c961eb..dca84db 100644 --- a/src/config/sync/field.field.node.reponse.field_besoin.yml +++ b/src/config/sync/field.field.node.reponse.field_besoin_on_reponses.yml @@ -1,19 +1,25 @@ -uuid: 427d92a7-ee39-4184-bf23-074aebb26faf +uuid: 13a2410a-c986-4080-a136-f180df9391ab langcode: fr status: true dependencies: config: - - field.storage.node.field_besoin + - field.storage.node.field_besoin_on_reponses - node.type.besoin - node.type.reponse -id: node.reponse.field_besoin -field_name: field_besoin + module: + - epp +third_party_settings: + epp: + value: 'target_id: ''[current-page:query:besoin_id]''' + on_update: 0 +id: node.reponse.field_besoin_on_reponses +field_name: field_besoin_on_reponses entity_type: node bundle: reponse -label: Besoin +label: besoin description: '' required: false -translatable: true +translatable: false default_value: { } default_value_callback: '' settings: diff --git a/src/config/sync/field.field.paragraph.source.field_description.yml b/src/config/sync/field.field.paragraph.source.field_description.yml index c6d3467..6e86ef6 100644 --- a/src/config/sync/field.field.paragraph.source.field_description.yml +++ b/src/config/sync/field.field.paragraph.source.field_description.yml @@ -6,7 +6,12 @@ dependencies: - field.storage.paragraph.field_description - paragraphs.paragraphs_type.source module: + - allowed_formats - text +third_party_settings: + allowed_formats: + allowed_formats: + - linkonly id: paragraph.source.field_description field_name: field_description entity_type: paragraph diff --git a/src/config/sync/field.storage.node.field_besoin_on_reponses.yml b/src/config/sync/field.storage.node.field_besoin_on_reponses.yml new file mode 100644 index 0000000..ddbf405 --- /dev/null +++ b/src/config/sync/field.storage.node.field_besoin_on_reponses.yml @@ -0,0 +1,19 @@ +uuid: 5d423353-2eb9-48fc-b6ac-e4a70b8d318c +langcode: fr +status: true +dependencies: + module: + - node +id: node.field_besoin_on_reponses +field_name: field_besoin_on_reponses +entity_type: node +type: entity_reference +settings: + target_type: node +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module b/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module index 6acbb09..2721023 100644 --- a/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module +++ b/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Form\FormStateInterface; /** * Implements hook_help(). @@ -62,3 +63,12 @@ function ouatt_puissanceagir_inline_entity_form_entity_form_alter(&$entity_form, function ouatt_puissanceagir_inline_entity_form_table_fields_alter(&$fields, $context) { $t="t"; } + +/** + * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\node\NodeForm. + * + */ +function ouatt_puissanceagir_form_node_reponse_form_alter(&$form, FormStateInterface $form_state) { + $t="t"; + // $form['field_besoin_on_response']['widget']['#disabled'] = true; +} diff --git a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css index fb410b6..a3d3d42 100644 --- a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css +++ b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css @@ -104,7 +104,6 @@ div[data-drupal-selector=edit-actions] > * { /* reset */ float: none; box-sizing: border-box; - width: auto; padding-right: 0; /* LTR */ /* custom */ flex: 1 0 auto; @@ -213,25 +212,33 @@ div[data-drupal-selector=edit-actions] > * { flex-direction: row; gap: 1em; } +#boussole-layout textarea { + resize: vertical; +} #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] { flex: 0 0 50em; max-height: calc(100vh - 150px); overflow-y: auto; } -#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] table.field-multiple-table > tbody > tr { +#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table, #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody, #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody > tr { + width: 100%; + word-break: break-all; + overflow-wrap: break-word; +} +#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody > tr { border: none; } -#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div { +#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div { padding: 0.5em; border: 1px solid #bbb; border-radius: 5px; transition: all 2s ease-in-out; } -#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div.entite-over { +#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div.entite-over { border-color: #01ffe2; transition: all 0.2s ease-in-out; } -#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div .horizontal-tabs-panes > details > .seven-details__wrapper { +#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] > table.field-multiple-table > tbody > tr > td:not(.field-multiple-drag) > div .horizontal-tabs-panes > details > .seven-details__wrapper { padding: 0; } #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] .field--type-entity-reference.field--name-field-entite.field--widget-inline-entity-form-complex > div > fieldset { @@ -248,9 +255,6 @@ div[data-drupal-selector=edit-actions] > * { #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] .field--type-entity-reference.field--name-field-entite.field--widget-inline-entity-form-complex > div > fieldset .fieldset-wrapper > table > tbody > tr { border: none; } -#boussole-layout > .form-item[data-drupal-selector=edit-field-entite] input[type=text] { - max-width: 60%; -} #boussole-layout > .form-item[data-drupal-selector=edit-field-entite] td.field-multiple-drag { min-width: 0; width: 25px; diff --git a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map index 6019f36..25be47a 100644 --- a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map +++ b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/ouatminimal.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;;;AAEF;AAAA;EAEE;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAKI;EACE;;;AAKN;EACE;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACE;EACA;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;AACA;EACE;;;AAGF;AACA;EAIE;IACE;IACA;IACA;;EAGF;IACE;IACA;;EAGF;AACE;IACA;IACA;IACA;IACA;AACA;IACA;;EAGF;IACE;IACA;IACA;;EAGF;AACE;IACA;IACA;AACA;IACA;;EAGF;IACE;;AAGF;EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IASE;IACA;IACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;EAEE;IACE;;EAEF;AAAA;AAAA;IAGE;IACA;IACA;;;AAKJ;AAEE;EACE;EACA;EACA;EAAU;EACV;AAeA;AAAA;AAAA;;AAbA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;AAAA;EAEE;EACA;;AAQJ;AACE;EACA;;AAEF;EACE;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAEF;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAKJ;EACE;;;AAOJ;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;EACE;EACA;EACA;;AAEA;EACE;;AAIA;EACE;;AAEF;EACE;;AAMN;EACE;;AAGF;EACE;EACA;;AAKA;AAAA;EACE;;AAGF;AAAA;EACE;;AACA;AAAA;EACE;;AAMN;EACE;;AAeJ;EACE;EACA;AAEA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EAAY;EACZ;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGF;EACE;;;AAYV;AAAA;AAAA;EAGE;;;AAGF;AAAA;EAEE;;;AAKF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE","file":"ouatminimal.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/ouatminimal.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;;;AAEF;AAAA;EAEE;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAKI;EACE;;;AAKN;EACE;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACE;EACA;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;AACA;EACE;;;AAGF;AACA;EAIE;IACE;IACA;IACA;;EAGF;IACE;IACA;;EAGF;AACE;IACA;IACA;IAEA;AACA;IACA;;EAGF;IACE;IACA;IACA;;EAGF;AACE;IACA;IACA;AACA;IACA;;EAGF;IACE;;AAGF;EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IASE;IACA;IACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;EAEE;IACE;;EAEF;AAAA;AAAA;IAGE;IACA;IACA;;;AAKJ;AAEE;EACE;EACA;EACA;EAAU;EACV;AAeA;AAAA;AAAA;;AAbA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;AAAA;EAEE;EACA;;AAQJ;AACE;EACA;;AAEF;EACE;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAEF;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAKJ;EACE;;;AAOJ;EACE;EACA;EACA;;AAEA;EACE;;AAKF;EACE;EACA;EACA;;AAGE;EACE;EACA;EACA;;AAIF;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAKR;EACE;EACA;EACA;;AAEA;EACE;;AAIA;EACE;;AAEF;EACE;;AAWN;EACE;EACA;;AAKA;AAAA;EACE;;AAGF;AAAA;EACE;;AACA;AAAA;EACE;;AAMN;EACE;;AAeJ;EACE;EACA;AAEA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EAAY;EACZ;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGF;EACE;;;AAYV;AAAA;AAAA;EAGE;;;AAGF;AAAA;EAEE;;;AAMF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE","file":"ouatminimal.css"} \ No newline at end of file diff --git a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme index d393e95..c9883cf 100644 --- a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme +++ b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme @@ -126,6 +126,13 @@ function ouatminimal_preprocess_form_element(&$variables) { } } +function ouatminimal_preprocess_textarea(&$variables) { + $element = $variables['element']; + unset($variables['element']['#cols']); + $variables['attributes']->removeAttribute('cols'); + // $variables['attributes']->setAttribute('cols', 40); +} + function ouatminimal_preprocess_node_edit_form__node_concernement(&$variables) { // $variables['form']['advanced']['#group'] = "group_admin"; // $ph = $variables['form']['title']['widget'][0]['value']['#placeholder']; @@ -190,5 +197,10 @@ function ouatminimal_preprocess_input(&$variables) { + } + if ($element['#type'] === "text" || $element['#type'] === "url") { + unset($variables['element']['#size']); + // $variables['attributes']->removeAttribute('size'); + // $variables['attributes']->setAttribute('cols', 40); } } \ No newline at end of file diff --git a/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss b/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss index 8559f42..a65d51e 100644 --- a/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss +++ b/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss @@ -108,7 +108,7 @@ div[data-drupal-selector="edit-actions"]{ /* reset */ float: none; box-sizing: border-box; - width: auto; + // width: auto; padding-right:0; /* LTR */ /* custom */ flex: 1 0 auto; @@ -232,27 +232,42 @@ div[data-drupal-selector="edit-actions"]{ flex-direction: row; gap: 1em; + textarea{ + resize: vertical; + // width:30%; + // max-width: 30%; + } + >.form-item[data-drupal-selector="edit-field-entite"]{ flex:0 0 50em; max-height: calc(100vh - 150px); overflow-y: auto; - - table.field-multiple-table>tbody>tr{ - border: none; - - >td:not(.field-multiple-drag)>div{ - padding:0.5em; - border: 1px solid #bbb; - border-radius: 5px; - transition: all 2s ease-in-out; - - &.entite-over{ - border-color: #01ffe2; - transition: all 0.2s ease-in-out; - } - - .horizontal-tabs-panes>details>.seven-details__wrapper{ - padding:0; + // outline: red 1px solid; + >table.field-multiple-table{ + &, >tbody, >tbody>tr{ + width: 100%; + word-break: break-all; + overflow-wrap: break-word; + } + >tbody{ + } + >tbody>tr{ + border: none; + + >td:not(.field-multiple-drag)>div{ + padding:0.5em; + border: 1px solid #bbb; + border-radius: 5px; + transition: all 2s ease-in-out; + + &.entite-over{ + border-color: #01ffe2; + transition: all 0.2s ease-in-out; + } + + .horizontal-tabs-panes>details>.seven-details__wrapper{ + padding:0; + } } } } @@ -276,9 +291,10 @@ div[data-drupal-selector="edit-actions"]{ } - input[type="text"]{ - max-width: 60%; - } + // input[type="text"], + // input[type="url"]{ + // max-width: 80%; + // } td.field-multiple-drag { min-width: 0; @@ -377,6 +393,7 @@ div.field--name-field-menace-maintien label{ } +// BESOIN fieldset[data-drupal-selector="edit-field-besoin"] { border:none; @@ -388,4 +405,10 @@ fieldset[data-drupal-selector="edit-field-besoin"] { >div.fieldset-wrapper>table>tbody>tr.ief-row-form{ border: 1px #ccc solid; } +} + +// Reponse +.field--name-field-besoin-on-reponses.field__item { + // font-size: large; + // padding: 1em 0; } \ No newline at end of file diff --git a/src/web/themes/custom/ouatminimal_theme/templates/form/textarea.html.twig b/src/web/themes/custom/ouatminimal_theme/templates/form/textarea.html.twig new file mode 100644 index 0000000..99e1bde --- /dev/null +++ b/src/web/themes/custom/ouatminimal_theme/templates/form/textarea.html.twig @@ -0,0 +1,25 @@ +{# +/** + * @file + * Theme override for a 'textarea' #type form element. + * + * Available variables + * - wrapper_attributes: A list of HTML attributes for the wrapper element. + * - attributes: A list of HTML attributes for the +