From 1b58580cb0aabc7ea1558f19f43b1a2663bfb4f4 Mon Sep 17 00:00:00 2001 From: ouidade Date: Mon, 27 Nov 2023 16:06:28 +0100 Subject: [PATCH 1/9] css login form --- web/themes/custom/reha/css/reha.css | 55 ++++++++++++------- .../reha/scss/global/variables/_buttons.scss | 5 +- .../custom/reha/scss/partials/_forms.scss | 19 +++++-- .../custom/reha/scss/partials/_header.scss | 24 +++++++- 4 files changed, 73 insertions(+), 30 deletions(-) diff --git a/web/themes/custom/reha/css/reha.css b/web/themes/custom/reha/css/reha.css index 4ae2122..1ab73c3 100644 --- a/web/themes/custom/reha/css/reha.css +++ b/web/themes/custom/reha/css/reha.css @@ -2,7 +2,7 @@ /*reha*/ /*global*/ /* Colors used for REHA */ -.field--type-link, .field--type-file, .links, .create-account-link, .request-password-link, .views-field-edit-node, .views-field-edit-user, .layout-sidebar-first #block-reha-phase1 footer { +.field--type-link, .field--type-file, .links, .create-account-link, .request-password-link, .views-field-edit-node, .views-field-edit-user, .form-submit, .layout-sidebar-first #block-reha-phase1 footer { text-transform: uppercase; padding: 1rem; border: solid black 1px; @@ -17,14 +17,13 @@ border: none !important; cursor: pointer; } -.create-account-link { - width: 80%; } - .views-field-edit-node { - width: fit-content; } + width: fit-content; + margin-top: 1rem; } .views-field-edit-user { - width: fit-content; } + width: fit-content; + margin-top: 1rem; } #edit-unlock { display: none; } @@ -234,16 +233,23 @@ header { position: relative; left: 430px; } header .region-header #block-reha-connexionutilisateur .connexion .connexion-full #user-login-form { - width: 70%; + width: 80%; display: flex; flex-direction: column; - align-items: end; } + align-items: start; + padding-left: 2.5rem; } header .region-header #block-reha-connexionutilisateur .connexion .connexion-full ul { width: 70%; display: flex; flex-direction: column; } header .region-header #block-reha-connexionutilisateur .connexion .connexion-full ul li { margin-bottom: 3rem; } + header .region-header #block-reha-connexionutilisateur .connexion .connexion-full ul:last-of-type a { + text-transform: uppercase; + padding: 1rem; + border: solid black 1px; + margin-bottom: 1rem; + background-color: white; } header .region-header #block-reha-config-pages { grid-column: 10; display: flex; @@ -307,9 +313,14 @@ header { header .region-header #block-reha-views-block-current-user-block-block-1 .connected .connected-full ul { width: 70%; display: flex; - flex-direction: column; } + flex-direction: column; + padding-left: 0; } header .region-header #block-reha-views-block-current-user-block-block-1 .connected .connected-full ul li { - margin-bottom: 3rem; } + text-transform: uppercase; + padding: 1rem; + border: solid black 1px; + margin-bottom: 1rem; + background-color: white; } header .bouton { align-self: flex-end; width: fit-content; } @@ -383,21 +394,22 @@ input { width: 50%; } .form-submit { - background-color: white; - border: solid black 1px; - text-transform: uppercase; - padding: 1rem; height: 5rem !important; margin-bottom: 1rem; - font-size: 1.3rem; + font-size: 1.2rem; font-weight: 300; width: fit-content; } -#user-login-form .form-item { - flex-direction: row; - margin: 1rem; } - #user-login-form .form-item label { - padding-right: 0.5rem; } +#user-login-form { + padding-left: 2rem; } + #user-login-form .form-item { + flex-direction: row; + padding-bottom: 1rem; + padding-left: 0.2; + width: 80%; } + #user-login-form .form-item label { + padding-right: 0.5rem; + flex: 1 1 auto; } .layout-sidebar-first #block-reha-phase1 { border: solid #fdc300 1px; @@ -507,6 +519,9 @@ input { .node-type-operation .views-field-edit-node { background-color: rgba(153, 147, 174, 0) !important; } +html.js body div.dialog-off-canvas-main-canvas div.layout-container main div.layout-content div.region.region-content div#block-reha-contenudelapageprincipale.block.block-system.block-system-main-block div.views-element-container div.js-view-dom-id-586565a78462afa14f00a79092967e0998bcad1d346481ed34544a2c80124f64 footer { + background-color: rgba(153, 147, 174, 0) !important; } + #block-reha-contenudelapageprincipale #node-operation-form #edit-field-fiche-candidature-wrapper { width: fit-content; } diff --git a/web/themes/custom/reha/scss/global/variables/_buttons.scss b/web/themes/custom/reha/scss/global/variables/_buttons.scss index 7b03d82..e514ed6 100644 --- a/web/themes/custom/reha/scss/global/variables/_buttons.scss +++ b/web/themes/custom/reha/scss/global/variables/_buttons.scss @@ -32,7 +32,7 @@ .create-account-link{ @extend %buttonwithborder; - width: 80% + // width: 80% } .request-password-link{ @extend %buttonwithborder; @@ -40,11 +40,14 @@ .views-field-edit-node{ @extend %buttonwithborder; width: fit-content; + margin-top: 1rem; + } .views-field-edit-user{ @extend %buttonwithborder; width: fit-content; + margin-top: 1rem; } footer{ diff --git a/web/themes/custom/reha/scss/partials/_forms.scss b/web/themes/custom/reha/scss/partials/_forms.scss index 9c8c245..ab60f0b 100644 --- a/web/themes/custom/reha/scss/partials/_forms.scss +++ b/web/themes/custom/reha/scss/partials/_forms.scss @@ -10,23 +10,30 @@ input{ width: 50%; } .form-submit{ - background-color: white; - border: solid black 1px; - text-transform: uppercase; - padding: 1rem; + // background-color: white; + // border: solid black 1px; + // text-transform: uppercase; + // padding: 1rem; height: 5rem !important; margin-bottom: 1rem; - font-size: 1.3rem; + font-size: 1.2rem; font-weight: 300; width: fit-content; + @extend %buttonwithborder; + } #user-login-form{ + padding-left: 2rem; .form-item{ flex-direction: row; - margin: 1rem; + padding-bottom: 1rem; + padding-left: 0.2; + width: 80%; + label{ padding-right: 0.5rem; + flex: 1 1 auto; } } } diff --git a/web/themes/custom/reha/scss/partials/_header.scss b/web/themes/custom/reha/scss/partials/_header.scss index ebecbcd..503f047 100644 --- a/web/themes/custom/reha/scss/partials/_header.scss +++ b/web/themes/custom/reha/scss/partials/_header.scss @@ -78,10 +78,11 @@ header{ } } #user-login-form{ - width: 70%; + width: 80%; display: flex; flex-direction: column; - align-items: end; + align-items: start; + padding-left: 2.5rem; } ul{ width: 70%; @@ -90,6 +91,17 @@ header{ li{ margin-bottom: 3rem; } + + } + ul:last-of-type{ + a{ + text-transform: uppercase; + padding: 1rem; + border: solid black 1px; + margin-bottom: 1rem; + background-color: $white-button; + + } } } } @@ -171,8 +183,14 @@ header{ width: 70%; display: flex; flex-direction: column; + padding-left: 0; li{ - margin-bottom: 3rem; + // margin-bottom: 3rem; + text-transform: uppercase; + padding: 1rem; + border: solid black 1px; + margin-bottom: 1rem; + background-color: $white-button; } } } From 42ae47b87f5e8e55fa8b8985406eb8335cfd3963 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 16:52:25 +0100 Subject: [PATCH 2/9] changed admin theme --- ...imal_actionsdadministrationprincipales.yml | 18 + config/sync/block.block.figlimal_aide.yml | 20 ++ ...ck.block.figlimal_connexionutilisateur.yml | 20 ++ ...ock.figlimal_contenudelapageprincipale.yml | 20 ++ .../sync/block.block.figlimal_filsdariane.yml | 20 ++ config/sync/block.block.figlimal_messages.yml | 20 ++ config/sync/block.block.figlimal_onglets.yml | 20 ++ .../sync/block.block.figlimal_onglets_2.yml | 20 ++ config/sync/block.block.figlimal_phase1..yml | 30 ++ .../sync/block.block.figlimal_titredepage.yml | 18 + ...ty_view_display.node.operation.compact.yml | 4 +- config/sync/core.extension.yml | 1 + config/sync/system.theme.yml | 2 +- config/sync/views.view.content.yml | 328 ++++++++++++++++-- web/themes/custom/figlimal/css/styles.css | 8 + web/themes/custom/figlimal/figlimal.info.yml | 21 ++ .../custom/figlimal/figlimal.libraries.yml | 7 + web/themes/custom/figlimal/figlimal.theme | 27 ++ web/themes/custom/figlimal/js/figlimal.js | 17 + 19 files changed, 589 insertions(+), 32 deletions(-) create mode 100644 config/sync/block.block.figlimal_actionsdadministrationprincipales.yml create mode 100644 config/sync/block.block.figlimal_aide.yml create mode 100644 config/sync/block.block.figlimal_connexionutilisateur.yml create mode 100644 config/sync/block.block.figlimal_contenudelapageprincipale.yml create mode 100644 config/sync/block.block.figlimal_filsdariane.yml create mode 100644 config/sync/block.block.figlimal_messages.yml create mode 100644 config/sync/block.block.figlimal_onglets.yml create mode 100644 config/sync/block.block.figlimal_onglets_2.yml create mode 100644 config/sync/block.block.figlimal_phase1..yml create mode 100644 config/sync/block.block.figlimal_titredepage.yml create mode 100644 web/themes/custom/figlimal/css/styles.css create mode 100644 web/themes/custom/figlimal/figlimal.info.yml create mode 100644 web/themes/custom/figlimal/figlimal.libraries.yml create mode 100644 web/themes/custom/figlimal/figlimal.theme create mode 100644 web/themes/custom/figlimal/js/figlimal.js diff --git a/config/sync/block.block.figlimal_actionsdadministrationprincipales.yml b/config/sync/block.block.figlimal_actionsdadministrationprincipales.yml new file mode 100644 index 0000000..0374885 --- /dev/null +++ b/config/sync/block.block.figlimal_actionsdadministrationprincipales.yml @@ -0,0 +1,18 @@ +uuid: 63a81ad5-87d0-423d-8ce9-33026f8691ee +langcode: fr +status: true +dependencies: + theme: + - figlimal +id: figlimal_actionsdadministrationprincipales +theme: figlimal +region: content +weight: -3 +provider: null +plugin: local_actions_block +settings: + id: local_actions_block + label: "Actions d'administration principales" + label_display: '0' + provider: core +visibility: { } diff --git a/config/sync/block.block.figlimal_aide.yml b/config/sync/block.block.figlimal_aide.yml new file mode 100644 index 0000000..b09b5d3 --- /dev/null +++ b/config/sync/block.block.figlimal_aide.yml @@ -0,0 +1,20 @@ +uuid: faa3efd7-d6c0-47f6-a4ec-6290189b085f +langcode: fr +status: true +dependencies: + module: + - help + theme: + - figlimal +id: figlimal_aide +theme: figlimal +region: help +weight: 0 +provider: null +plugin: help_block +settings: + id: help_block + label: Aide + label_display: '0' + provider: help +visibility: { } diff --git a/config/sync/block.block.figlimal_connexionutilisateur.yml b/config/sync/block.block.figlimal_connexionutilisateur.yml new file mode 100644 index 0000000..ebed431 --- /dev/null +++ b/config/sync/block.block.figlimal_connexionutilisateur.yml @@ -0,0 +1,20 @@ +uuid: b12431c1-fb90-4f20-8189-0de84c6a366f +langcode: fr +status: true +dependencies: + module: + - user + theme: + - figlimal +id: figlimal_connexionutilisateur +theme: figlimal +region: content +weight: 0 +provider: null +plugin: user_login_block +settings: + id: user_login_block + label: 'Connexion utilisateur' + label_display: visible + provider: user +visibility: { } diff --git a/config/sync/block.block.figlimal_contenudelapageprincipale.yml b/config/sync/block.block.figlimal_contenudelapageprincipale.yml new file mode 100644 index 0000000..6062091 --- /dev/null +++ b/config/sync/block.block.figlimal_contenudelapageprincipale.yml @@ -0,0 +1,20 @@ +uuid: 65acaecc-9377-49b8-a87d-fff8b0315dab +langcode: fr +status: true +dependencies: + module: + - system + theme: + - figlimal +id: figlimal_contenudelapageprincipale +theme: figlimal +region: content +weight: -2 +provider: null +plugin: system_main_block +settings: + id: system_main_block + label: 'Contenu de la page principale' + label_display: '0' + provider: system +visibility: { } diff --git a/config/sync/block.block.figlimal_filsdariane.yml b/config/sync/block.block.figlimal_filsdariane.yml new file mode 100644 index 0000000..0e8d59c --- /dev/null +++ b/config/sync/block.block.figlimal_filsdariane.yml @@ -0,0 +1,20 @@ +uuid: 7503157f-df68-4a93-bc63-664ec3ad0d36 +langcode: fr +status: true +dependencies: + module: + - system + theme: + - figlimal +id: figlimal_filsdariane +theme: figlimal +region: breadcrumb +weight: 0 +provider: null +plugin: system_breadcrumb_block +settings: + id: system_breadcrumb_block + label: "Fils d'ariane" + label_display: '0' + provider: system +visibility: { } diff --git a/config/sync/block.block.figlimal_messages.yml b/config/sync/block.block.figlimal_messages.yml new file mode 100644 index 0000000..64c987f --- /dev/null +++ b/config/sync/block.block.figlimal_messages.yml @@ -0,0 +1,20 @@ +uuid: c5d4471d-39d5-4ce0-8294-b997de1a416f +langcode: fr +status: true +dependencies: + module: + - system + theme: + - figlimal +id: figlimal_messages +theme: figlimal +region: highlighted +weight: 0 +provider: null +plugin: system_messages_block +settings: + id: system_messages_block + label: 'Messages de status' + label_display: '0' + provider: system +visibility: { } diff --git a/config/sync/block.block.figlimal_onglets.yml b/config/sync/block.block.figlimal_onglets.yml new file mode 100644 index 0000000..27ea1e6 --- /dev/null +++ b/config/sync/block.block.figlimal_onglets.yml @@ -0,0 +1,20 @@ +uuid: bb2808e4-3b85-4692-bee8-7c228b891016 +langcode: fr +status: true +dependencies: + theme: + - figlimal +id: figlimal_onglets +theme: figlimal +region: header +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Onglets principaux' + label_display: '0' + provider: core + primary: true + secondary: false +visibility: { } diff --git a/config/sync/block.block.figlimal_onglets_2.yml b/config/sync/block.block.figlimal_onglets_2.yml new file mode 100644 index 0000000..acbbda2 --- /dev/null +++ b/config/sync/block.block.figlimal_onglets_2.yml @@ -0,0 +1,20 @@ +uuid: fdd5f360-dd8e-4d71-8a35-f98512bedc14 +langcode: fr +status: true +dependencies: + theme: + - figlimal +id: figlimal_onglets_2 +theme: figlimal +region: pre_content +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Onglets secondaires' + label_display: '0' + provider: core + primary: false + secondary: true +visibility: { } diff --git a/config/sync/block.block.figlimal_phase1..yml b/config/sync/block.block.figlimal_phase1..yml new file mode 100644 index 0000000..f58e9da --- /dev/null +++ b/config/sync/block.block.figlimal_phase1..yml @@ -0,0 +1,30 @@ +uuid: e1f7fce2-16f4-4c1c-b99a-e01febac2db6 +langcode: fr +status: true +dependencies: + content: + - 'block_content:text:e05f593a-38ab-4dba-ad1c-9ae23c1222a9' + module: + - block_content + - system + theme: + - figlimal +id: figlimal_phase1. +theme: figlimal +region: sidebar_first +weight: 0 +provider: null +plugin: 'block_content:e05f593a-38ab-4dba-ad1c-9ae23c1222a9' +settings: + id: 'block_content:e05f593a-38ab-4dba-ad1c-9ae23c1222a9' + label: 'Phase 1.' + label_display: visible + provider: block_content + status: true + info: '' + view_mode: full +visibility: + request_path: + id: request_path + negate: true + pages: '' diff --git a/config/sync/block.block.figlimal_titredepage.yml b/config/sync/block.block.figlimal_titredepage.yml new file mode 100644 index 0000000..2cb466a --- /dev/null +++ b/config/sync/block.block.figlimal_titredepage.yml @@ -0,0 +1,18 @@ +uuid: da4c5403-1ccf-448c-a715-9095c915cc5d +langcode: fr +status: true +dependencies: + theme: + - figlimal +id: figlimal_titredepage +theme: figlimal +region: header +weight: -1 +provider: null +plugin: page_title_block +settings: + id: page_title_block + label: 'Titre de page' + label_display: '0' + provider: core +visibility: { } diff --git a/config/sync/core.entity_view_display.node.operation.compact.yml b/config/sync/core.entity_view_display.node.operation.compact.yml index 88397ac..d62ffcb 100644 --- a/config/sync/core.entity_view_display.node.operation.compact.yml +++ b/config/sync/core.entity_view_display.node.operation.compact.yml @@ -20,14 +20,14 @@ mode: compact content: field_adresse: type: address_plain - label: inline + label: above settings: { } third_party_settings: { } weight: 0 region: content field_commentaire: type: basic_string - label: inline + label: above settings: { } third_party_settings: { } weight: 1 diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 3cf3f50..6ce196a 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -128,4 +128,5 @@ theme: adminimal_theme: 0 stark: 0 reha: 0 + figlimal: 0 profile: figli_starter_kit diff --git a/config/sync/system.theme.yml b/config/sync/system.theme.yml index 0999ca3..67e0af8 100644 --- a/config/sync/system.theme.yml +++ b/config/sync/system.theme.yml @@ -1,5 +1,5 @@ _core: default_config_hash: TpdA4rsOBAawnqeon9A-Ooht_4VO3hHKib79xyHcTyg langcode: fr -admin: adminimal_theme +admin: figlimal default: reha diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index 8f6c7af..4322259 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -3,11 +3,16 @@ langcode: fr status: true dependencies: config: - - core.entity_view_mode.node.compact - core.entity_view_mode.user.compact + - field.storage.node.field_adresse + - field.storage.node.field_commentaire + - field.storage.node.field_dossier_de_candidature + - field.storage.node.field_fiche_candidature - node.type.operation - node.type.static module: + - address + - file - node - user _core: @@ -491,8 +496,7 @@ display: mail: title rendered_entity: rendered_entity rendered_entity_1: rendered_entity_1 - changed: changed - default: changed + default: '-1' info: title: sortable: true @@ -500,7 +504,7 @@ display: align: '' separator: '
' empty_column: false - responsive: '' + responsive: priority-low mail: sortable: false default_sort_order: asc @@ -514,7 +518,7 @@ display: align: '' separator: '' empty_column: false - responsive: '' + responsive: priority-low rendered_entity_1: sortable: false default_sort_order: asc @@ -522,13 +526,6 @@ display: separator: '' empty_column: false responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low override: true sticky: true summary: '' @@ -767,8 +764,8 @@ display: label: Titre exclude: false alter: - alter_text: false - text: '' + alter_text: true + text: '

{{ title }}

' make_link: false path: '' absolute: false @@ -800,7 +797,7 @@ display: element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' - element_default_classes: true + element_default_classes: false empty: '' hide_empty: false empty_zero: false @@ -934,16 +931,77 @@ display: empty_zero: false hide_alter_empty: true view_mode: compact - rendered_entity_1: - id: rendered_entity_1 - table: node - field: rendered_entity + field_adresse: + id: field_adresse + table: node__field_adresse + field: field_adresse relationship: none group_type: group admin_label: '' - entity_type: node - plugin_id: rendered_entity - label: 'Entité rendue' + plugin_id: field + label: Adresse + 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: 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: langcode + type: address_default + settings: { } + 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 + field_dossier_de_candidature: + id: field_dossier_de_candidature + table: node__field_dossier_de_candidature + field: field_dossier_de_candidature + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Dossier de candidature' exclude: false alter: alter_text: false @@ -984,7 +1042,145 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - view_mode: compact + click_sort_column: target_id + type: file_default + settings: + use_description_as_link_text: true + 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 + field_fiche_candidature: + id: field_fiche_candidature + table: node__field_fiche_candidature + field: field_fiche_candidature + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Fiche candidature' + 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: file_default + settings: + use_description_as_link_text: true + 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 + field_commentaire: + id: field_commentaire + table: node__field_commentaire + field: field_commentaire + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: Commentaire + 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: value + type: basic_string + settings: { } + 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 filters: title: id: title @@ -1205,8 +1401,84 @@ display: operator: AND groups: 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + mail: title + rendered_entity: title + field_adresse: field_adresse + field_dossier_de_candidature: field_dossier_de_candidature + field_fiche_candidature: field_fiche_candidature + field_commentaire: field_commentaire + default: '-1' + info: + title: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + mail: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + rendered_entity: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_adresse: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_dossier_de_candidature: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_fiche_candidature: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_commentaire: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + options: { } defaults: title: false + style: false + row: false fields: false filters: false filter_groups: false @@ -1238,11 +1510,9 @@ display: - 'user.node_grants:view' - user.permissions tags: - - 'config:core.entity_view_display.node.operation.compact' - - 'config:core.entity_view_display.node.operation.default' - - 'config:core.entity_view_display.node.operation.teaser' - - 'config:core.entity_view_display.node.static.content_no_title' - - 'config:core.entity_view_display.node.static.default' - - 'config:core.entity_view_display.node.static.teaser' - 'config:core.entity_view_display.user.user.compact' - 'config:core.entity_view_display.user.user.default' + - 'config:field.storage.node.field_adresse' + - 'config:field.storage.node.field_commentaire' + - 'config:field.storage.node.field_dossier_de_candidature' + - 'config:field.storage.node.field_fiche_candidature' diff --git a/web/themes/custom/figlimal/css/styles.css b/web/themes/custom/figlimal/css/styles.css new file mode 100644 index 0000000..85e2fbb --- /dev/null +++ b/web/themes/custom/figlimal/css/styles.css @@ -0,0 +1,8 @@ +div.view-id-content.view-display-id-page_2 td.views-field.views-field-title h2{ + margin:0; +} + +div.view-id-content.view-display-id-page_2 td.views-field.views-field-field-commentaire{ + width: 400px; +} + diff --git a/web/themes/custom/figlimal/figlimal.info.yml b/web/themes/custom/figlimal/figlimal.info.yml new file mode 100644 index 0000000..24ca368 --- /dev/null +++ b/web/themes/custom/figlimal/figlimal.info.yml @@ -0,0 +1,21 @@ +name: figlimal +type: theme +base theme: adminimal_theme +description: A flexible theme with a responsive, mobile-first layout. +package: Custom +core: 8.x +core_version_requirement: ^8 || ^9 || ^10 +libraries: + - figlimal/global +regions: + header: 'Header' + pre_content: 'Pre-content' + breadcrumb: Breadcrumb + highlighted: Highlighted + help: Help + content: Content + page_top: 'Page top' + page_bottom: 'Page bottom' + sidebar_first: 'First sidebar' +regions_hidden: + - sidebar_first diff --git a/web/themes/custom/figlimal/figlimal.libraries.yml b/web/themes/custom/figlimal/figlimal.libraries.yml new file mode 100644 index 0000000..eea15cd --- /dev/null +++ b/web/themes/custom/figlimal/figlimal.libraries.yml @@ -0,0 +1,7 @@ +# Main theme library. +global: + js: + js/figlimal.js: {} + css: + theme: + css/styles.css: {} diff --git a/web/themes/custom/figlimal/figlimal.theme b/web/themes/custom/figlimal/figlimal.theme new file mode 100644 index 0000000..b90b5ef --- /dev/null +++ b/web/themes/custom/figlimal/figlimal.theme @@ -0,0 +1,27 @@ + Date: Mon, 27 Nov 2023 18:00:44 +0100 Subject: [PATCH 3/9] mailsystem, changed site email --- composer.json | 1 + composer.lock | 66 ++++++++++++++++++++++++++++- config/sync/core.extension.yml | 1 + config/sync/mailsystem.settings.yml | 7 +++ config/sync/system.site.yml | 2 +- 5 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 config/sync/mailsystem.settings.yml diff --git a/composer.json b/composer.json index 93ad33d..13ed8c4 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "drupal/core-recommended": "^10.1", "drupal/linked_field": "^1.5", "drupal/login_destination": "^2.0@beta", + "drupal/mailsystem": "^4.4", "drupal/page_manager": "^4.0@RC", "drupal/panels": "^4.7", "drupal/paragraphs": "^1.16", diff --git a/composer.lock b/composer.lock index 83b3ab2..6d4b080 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": "f3783bee40de6bd346f434abe5d4872b", + "content-hash": "73f4d7fd3f57dc8b0c4ac584f3868baf", "packages": [ { "name": "asm89/stack-cors", @@ -5326,6 +5326,70 @@ "source": "https://git.drupalcode.org/project/maillog" } }, + { + "name": "drupal/mailsystem", + "version": "4.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/mailsystem.git", + "reference": "8.x-4.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/mailsystem-8.x-4.4.zip", + "reference": "8.x-4.4", + "shasum": "49b2e9efd090cdb4a282c7638b1c76d6723c47b6" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-4.4", + "datestamp": "1657576306", + "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": "Berdir", + "homepage": "https://www.drupal.org/user/214652" + }, + { + "name": "Les Lim", + "homepage": "https://www.drupal.org/user/84263" + }, + { + "name": "Manuel Garcia", + "homepage": "https://www.drupal.org/user/213194" + }, + { + "name": "miro_dietiker", + "homepage": "https://www.drupal.org/user/227761" + }, + { + "name": "Nafes", + "homepage": "https://www.drupal.org/user/2489926" + }, + { + "name": "pillarsdotnet", + "homepage": "https://www.drupal.org/user/36148" + } + ], + "description": "Mail System", + "homepage": "https://www.drupal.org/project/mailsystem", + "support": { + "source": "https://git.drupalcode.org/project/mailsystem" + } + }, { "name": "drupal/matomo", "version": "1.22.0", diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6ce196a..ab44cf7 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -74,6 +74,7 @@ module: locale: 0 login_destination: 0 maillog: 0 + mailsystem: 0 maxlength: 0 menu_block: 0 menu_link_content: 0 diff --git a/config/sync/mailsystem.settings.yml b/config/sync/mailsystem.settings.yml new file mode 100644 index 0000000..9adfb0f --- /dev/null +++ b/config/sync/mailsystem.settings.yml @@ -0,0 +1,7 @@ +_core: + default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s +langcode: fr +theme: current +defaults: + sender: php_mail + formatter: php_mail diff --git a/config/sync/system.site.yml b/config/sync/system.site.yml index cbe39f7..cf13cb1 100644 --- a/config/sync/system.site.yml +++ b/config/sync/system.site.yml @@ -3,7 +3,7 @@ _core: langcode: fr uuid: 78e2671c-703f-41e2-8fe0-06bfd262e6c2 name: reha -mail: dev@figureslibres.io +mail: webmaster@programme-reha-heritages.fr slogan: '' page: 403: '' From cf71581968b85b7c94d2dae4099720a14294574d Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 18:49:34 +0100 Subject: [PATCH 4/9] site settings, operation email rule --- config/sync/rules.reaction.new_operation_node_send_email.yml | 2 +- config/sync/system.site.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sync/rules.reaction.new_operation_node_send_email.yml b/config/sync/rules.reaction.new_operation_node_send_email.yml index 8dd9a31..ad5c5e9 100644 --- a/config/sync/rules.reaction.new_operation_node_send_email.yml +++ b/config/sync/rules.reaction.new_operation_node_send_email.yml @@ -31,7 +31,7 @@ expression: action_id: rules_send_email context_values: to: - - dev@figureslibres.io + - webmaster@programme-reha-heritages.fr subject: '[REHA] nouvelle opération crée' message: '@node.node_route_context:node.title' reply: '' diff --git a/config/sync/system.site.yml b/config/sync/system.site.yml index cf13cb1..da4289b 100644 --- a/config/sync/system.site.yml +++ b/config/sync/system.site.yml @@ -2,9 +2,9 @@ _core: default_config_hash: 3eoyJMZ2F5yndpX9nBrZLTRUzSvffH38lH5xN8tFvWE langcode: fr uuid: 78e2671c-703f-41e2-8fe0-06bfd262e6c2 -name: reha +name: 'Programme REHA-héritages' mail: webmaster@programme-reha-heritages.fr -slogan: '' +slogan: 'Programme national d’expérimentation et de recherche REHA-Héritages' page: 403: '' 404: '' From 0b1c38f93d49fd3dd56649a7b2801794b7edc770 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 20:43:35 +0100 Subject: [PATCH 5/9] config_ignore maillog.settings --- config/sync/config_ignore.settings.yml | 3 ++- config/sync/maillog.settings.yml | 8 +++++--- .../sync/rules.reaction.new_operation_node_send_email.yml | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config/sync/config_ignore.settings.yml b/config/sync/config_ignore.settings.yml index a494849..b33a614 100644 --- a/config/sync/config_ignore.settings.yml +++ b/config/sync/config_ignore.settings.yml @@ -1,4 +1,5 @@ _core: default_config_hash: LzdDtE3Im_Ysio7g1Eo8ymSMq0mgSQMPzv0khsr_J64 langcode: fr -ignored_config_entities: { } +ignored_config_entities: + - 'maillog.*' diff --git a/config/sync/maillog.settings.yml b/config/sync/maillog.settings.yml index efd3d7c..d1144be 100644 --- a/config/sync/maillog.settings.yml +++ b/config/sync/maillog.settings.yml @@ -1,6 +1,8 @@ _core: default_config_hash: UA1LGT2916TE3VyHCdi_cD-GPCb6ilm9KluygCKnqOI -send: false -log: true -verbose: true langcode: fr +send: false +nosend_notify: false +log: true +log_notify: false +verbose: false diff --git a/config/sync/rules.reaction.new_operation_node_send_email.yml b/config/sync/rules.reaction.new_operation_node_send_email.yml index ad5c5e9..975dbbc 100644 --- a/config/sync/rules.reaction.new_operation_node_send_email.yml +++ b/config/sync/rules.reaction.new_operation_node_send_email.yml @@ -32,8 +32,9 @@ expression: context_values: to: - webmaster@programme-reha-heritages.fr + - dev@figureslibres.io subject: '[REHA] nouvelle opération crée' - message: '@node.node_route_context:node.title' + message: test reply: '' language: '' context_mapping: { } From aad9678d496853600ab1d9790f8ee845cca3c530 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 20:57:52 +0100 Subject: [PATCH 6/9] mimemail --- .gitignore | 1 + composer.json | 1 + composer.lock | 52 ++++++- config/sync/core.extension.yml | 1 + config/sync/mailsystem.settings.yml | 2 +- config/sync/mimemail.settings.yml | 15 ++ web/sites/development.services.yml | 228 ---------------------------- 7 files changed, 70 insertions(+), 230 deletions(-) create mode 100644 config/sync/mimemail.settings.yml delete mode 100644 web/sites/development.services.yml diff --git a/.gitignore b/.gitignore index 3ff7996..b48fd13 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /web/sites/*/settings.local.php /web/sites/*/services*.yml /web/sites/*/salt.txt +/web/sites/development.services.yml # Ignore Drupal's file directory /web/sites/*/files/ diff --git a/composer.json b/composer.json index 13ed8c4..2e8daee 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "drupal/linked_field": "^1.5", "drupal/login_destination": "^2.0@beta", "drupal/mailsystem": "^4.4", + "drupal/mimemail": "^1.0@alpha", "drupal/page_manager": "^4.0@RC", "drupal/panels": "^4.7", "drupal/paragraphs": "^1.16", diff --git a/composer.lock b/composer.lock index 6d4b080..cf28fd4 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": "73f4d7fd3f57dc8b0c4ac584f3868baf", + "content-hash": "cdf7fc854d9e9b3060ff43d97e7f3ed3", "packages": [ { "name": "asm89/stack-cors", @@ -5708,6 +5708,55 @@ "issues": "https://www.drupal.org/project/issues/menu_position" } }, + { + "name": "drupal/mimemail", + "version": "1.0.0-alpha6", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/mimemail.git", + "reference": "8.x-1.0-alpha6" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/mimemail-8.x-1.0-alpha6.zip", + "reference": "8.x-1.0-alpha6", + "shasum": "c25246747dac4372c7d5a5a5fd0f276d9e468eff" + }, + "require": { + "drupal/core": "^9.3 || ^10", + "drupal/mailsystem": "^4" + }, + "require-dev": { + "drupal/rules": "^3" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-alpha6", + "datestamp": "1697143284", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "TR", + "homepage": "https://www.drupal.org/user/202830" + } + ], + "description": "Sends MIME-encoded emails with embedded images and attachments.", + "homepage": "https://www.drupal.org/project/mimemail", + "support": { + "source": "https://git.drupalcode.org/project/mimemail", + "issues": "https://www.drupal.org/project/issues/mimemail" + } + }, { "name": "drupal/page_manager", "version": "4.0.0-rc2", @@ -12698,6 +12747,7 @@ "minimum-stability": "stable", "stability-flags": { "drupal/login_destination": 20, + "drupal/mimemail": 15, "drupal/page_manager": 5, "drupal/phone_number": 15, "drupal/rules": 15, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index ab44cf7..10b2aeb 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -79,6 +79,7 @@ module: menu_block: 0 menu_link_content: 0 menu_ui: 0 + mimemail: 0 mysql: 0 node: 0 options: 0 diff --git a/config/sync/mailsystem.settings.yml b/config/sync/mailsystem.settings.yml index 9adfb0f..a7f26aa 100644 --- a/config/sync/mailsystem.settings.yml +++ b/config/sync/mailsystem.settings.yml @@ -4,4 +4,4 @@ langcode: fr theme: current defaults: sender: php_mail - formatter: php_mail + formatter: mime_mail diff --git a/config/sync/mimemail.settings.yml b/config/sync/mimemail.settings.yml new file mode 100644 index 0000000..ca07c9e --- /dev/null +++ b/config/sync/mimemail.settings.yml @@ -0,0 +1,15 @@ +_core: + default_config_hash: rpfRQVoEn2ZWd_lw-iULKPiuina5CqcmzXWlz1OjTwM +langcode: fr +name: 'Programme REHA-héritages' +mail: webmaster@programme-reha-heritages.fr +simple_address: false +sitestyle: false +textonly: true +linkonly: false +user_plaintext_field: '' +format: wysiwyg +preserve_class: false +advanced: + incoming: false + key: nEX93IxO3ghGoTn1TQxVSEj-Qx0Xj1S_8YcJ0gImnTA diff --git a/web/sites/development.services.yml b/web/sites/development.services.yml deleted file mode 100644 index 99d3902..0000000 --- a/web/sites/development.services.yml +++ /dev/null @@ -1,228 +0,0 @@ -parameters: - session.storage.options: - # Default ini options for sessions. - # - # Some distributions of Linux (most notably Debian) ship their PHP - # installations with garbage collection (gc) disabled. Since Drupal depends - # on PHP's garbage collection for clearing sessions, ensure that garbage - # collection occurs by using the most common settings. - # @default 1 - gc_probability: 1 - # @default 100 - gc_divisor: 100 - # - # Set session lifetime (in seconds), i.e. the grace period for session - # data. Sessions are deleted by the session garbage collector after one - # session lifetime has elapsed since the user's last visit. When a session - # is deleted, authenticated users are logged out, and the contents of the - # user's session is discarded. - # @default 200000 - gc_maxlifetime: 200000 - # - # Set session cookie lifetime (in seconds), i.e. the time from the session - # is created to the cookie expires, i.e. when the browser is expected to - # discard the cookie. The value 0 means "until the browser is closed". - # @default 2000000 - cookie_lifetime: 2000000 - # - # Drupal automatically generates a unique session cookie name based on the - # full domain name used to access the site. This mechanism is sufficient - # for most use-cases, including multi-site deployments. However, if it is - # desired that a session can be reused across different subdomains, the - # cookie domain needs to be set to the shared base domain. Doing so assures - # that users remain logged in as they cross between various subdomains. - # To maximize compatibility and normalize the behavior across user agents, - # the cookie domain should start with a dot. - # - # @default none - # cookie_domain: '.example.com' - # - # Set the SameSite cookie attribute: 'None', 'Lax', or 'Strict'. If set, - # this value will override the server value. See - # https://www.php.net/manual/en/session.security.ini.php for more - # information. - # @default no value - cookie_samesite: Lax - # - # Set the session ID string length. The length can be between 22 to 256. The - # PHP recommended value is 48. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 48 - sid_length: 48 - # - # Set the number of bits in encoded session ID character. The possible - # values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", - # ","). The PHP recommended value is 6. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 6 - sid_bits_per_character: 6 - twig.config: - # Twig debugging: - # - # When debugging is enabled: - # - The markup of each Twig template is surrounded by HTML comments that - # contain theming information, such as template file name suggestions. - # - Note that this debugging markup will cause automated tests that directly - # check rendered HTML to fail. When running automated tests, 'debug' - # should be set to FALSE. - # - The dump() function can be used in Twig templates to output information - # about template variables. - # - Twig templates are automatically recompiled whenever the source code - # changes (see auto_reload below). - # - # For more information about debugging Twig templates, see - # https://www.drupal.org/node/1906392. - # - # Enabling Twig debugging is not recommended in production environments. - # @default false - debug: true - # Twig auto-reload: - # - # Automatically recompile Twig templates whenever the source code changes. - # If you don't provide a value for auto_reload, it will be determined - # based on the value of debug. - # - # Enabling auto-reload is not recommended in production environments. - # @default null - auto_reload: null - # Twig cache: - # - # By default, Twig templates will be compiled and stored in the filesystem - # to increase performance. Disabling the Twig cache will recompile the - # templates from source each time they are used. In most cases the - # auto_reload setting above should be enabled rather than disabling the - # Twig cache. - # - # Disabling the Twig cache is not recommended in production environments. - # @default true - cache: true - # File extensions: - # - # List of file extensions the Twig system is allowed to load via the - # twig.loader.filesystem service. Files with other extensions will not be - # loaded unless they are added here. For example, to allow a file named - # 'example.partial' to be loaded, add 'partial' to this list. To load files - # with no extension, add an empty string '' to the list. - # - # @default ['css', 'html', 'js', 'svg', 'twig'] - allowed_file_extensions: - - css - - html - - js - - svg - - twig - renderer.config: - # Renderer required cache contexts: - # - # The Renderer will automatically associate these cache contexts with every - # render array, hence varying every render array by these cache contexts. - # - # @default ['languages:language_interface', 'theme', 'user.permissions'] - required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions'] - # Renderer automatic placeholdering conditions: - # - # Drupal allows portions of the page to be automatically deferred when - # rendering to improve cache performance. That is especially helpful for - # cache contexts that vary widely, such as the active user. On some sites - # those may be different, however, such as sites with only a handful of - # users. If you know what the high-cardinality cache contexts are for your - # site, specify those here. If you're not sure, the defaults are fairly safe - # in general. - # - # For more information about rendering optimizations see - # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing - auto_placeholder_conditions: - # Max-age at or below which caching is not considered worthwhile. - # - # Disable by setting to -1. - # - # @default 0 - max-age: 0 - # Cache contexts with a high cardinality. - # - # Disable by setting to []. - # - # @default ['session', 'user'] - contexts: ['session', 'user'] - # Tags with a high invalidation frequency. - # - # Disable by setting to []. - # - # @default [] - tags: [] - # Renderer cache debug: - # - # Allows cache debugging output for each rendered element. - # - # Enabling render cache debugging is not recommended in production - # environments. - # @default false - debug: false - # Cacheability debugging: - # - # Responses with cacheability metadata (CacheableResponseInterface instances) - # get X-Drupal-Cache-Tags, X-Drupal-Cache-Contexts and X-Drupal-Cache-Max-Age - # headers. - # - # For more information about debugging cacheable responses, see - # https://www.drupal.org/developing/api/8/response/cacheable-response-interface - # - # Enabling cacheability debugging is not recommended in production - # environments. - # @default false - http.response.debug_cacheability_headers: false - factory.keyvalue: {} - # Default key/value storage service to use. - # @default keyvalue.database - # default: keyvalue.database - # Collection-specific overrides. - # state: keyvalue.database - factory.keyvalue.expirable: {} - # Default key/value expirable storage service to use. - # @default keyvalue.database.expirable - # default: keyvalue.database.expirable - # Allowed protocols for URL generation. - filter_protocols: - - http - - https - - ftp - - news - - nntp - - tel - - telnet - - mailto - - irc - - ssh - - sftp - - webcal - - rtsp - - # Configure Cross-Site HTTP requests (CORS). - # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS - # for more information about the topic in general. - # Note: By default the configuration is disabled. - cors.config: - enabled: false - # Specify allowed headers, like 'x-allowed-header'. - allowedHeaders: [] - # Specify allowed request methods, specify ['*'] to allow all possible ones. - allowedMethods: [] - # Configure requests allowed from specific origins. Do not include trailing - # slashes with URLs. - allowedOrigins: ['*'] - # Sets the Access-Control-Expose-Headers header. - exposedHeaders: false - # Sets the Access-Control-Max-Age header. - maxAge: false - # Sets the Access-Control-Allow-Credentials header. - supportsCredentials: false - - queue.config: - # The maximum number of seconds to wait if a queue is temporarily suspended. - # This is not applicable when a queue is suspended but does not specify - # how long to wait before attempting to resume. - suspendMaximumWait: 30 From d1e0a0d4f6c9b76c4a06dae8cc43c7890fcf0478 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 21:20:39 +0100 Subject: [PATCH 7/9] removed rules, added notify --- composer.json | 1 + composer.lock | 55 ++++++++++++++++++- config/sync/core.extension.yml | 2 +- config/sync/filter.format.restricted_html.yml | 36 ------------ config/sync/notify.settings.yml | 16 ++++++ ...reaction.new_operation_node_send_email.yml | 52 ------------------ config/sync/rules.settings.yml | 9 --- config/sync/user.role.admin.yml | 2 + config/sync/user.role.anonymous.yml | 4 -- config/sync/user.role.editor.yml | 2 + 10 files changed, 76 insertions(+), 103 deletions(-) delete mode 100644 config/sync/filter.format.restricted_html.yml create mode 100644 config/sync/notify.settings.yml delete mode 100644 config/sync/rules.reaction.new_operation_node_send_email.yml delete mode 100644 config/sync/rules.settings.yml diff --git a/composer.json b/composer.json index 2e8daee..085f5fb 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "drupal/login_destination": "^2.0@beta", "drupal/mailsystem": "^4.4", "drupal/mimemail": "^1.0@alpha", + "drupal/notify": "^2.0@beta", "drupal/page_manager": "^4.0@RC", "drupal/panels": "^4.7", "drupal/paragraphs": "^1.16", diff --git a/composer.lock b/composer.lock index cf28fd4..e88600c 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": "cdf7fc854d9e9b3060ff43d97e7f3ed3", + "content-hash": "a73571264700d8d0446c0181bfc79ec9", "packages": [ { "name": "asm89/stack-cors", @@ -5757,6 +5757,58 @@ "issues": "https://www.drupal.org/project/issues/mimemail" } }, + { + "name": "drupal/notify", + "version": "2.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/notify.git", + "reference": "2.0.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/notify-2.0.0-beta1.zip", + "reference": "2.0.0-beta1", + "shasum": "a0f06792b4aed38c8c466389ae4c03497c4c9270" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-beta1", + "datestamp": "1699808614", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "gisle", + "homepage": "https://www.drupal.org/user/409554" + }, + { + "name": "matt2000", + "homepage": "https://www.drupal.org/user/143172" + }, + { + "name": "rik.scholten", + "homepage": "https://www.drupal.org/user/3661104" + } + ], + "description": "Enables notifications of new content and comments by e-mail.", + "homepage": "https://www.drupal.org/project/notify", + "support": { + "source": "https://git.drupalcode.org/project/notify" + } + }, { "name": "drupal/page_manager", "version": "4.0.0-rc2", @@ -12748,6 +12800,7 @@ "stability-flags": { "drupal/login_destination": 20, "drupal/mimemail": 15, + "drupal/notify": 10, "drupal/page_manager": 5, "drupal/phone_number": 15, "drupal/rules": 15, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 10b2aeb..5434fc2 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -82,6 +82,7 @@ module: mimemail: 0 mysql: 0 node: 0 + notify: 0 options: 0 page_cache: 0 page_manager: 0 @@ -96,7 +97,6 @@ module: phone_number: 0 redis: 0 responsive_image: 0 - rules: 0 search_api: 0 search_api_db: 0 smart_trim: 0 diff --git a/config/sync/filter.format.restricted_html.yml b/config/sync/filter.format.restricted_html.yml deleted file mode 100644 index 3c37899..0000000 --- a/config/sync/filter.format.restricted_html.yml +++ /dev/null @@ -1,36 +0,0 @@ -uuid: fd70c6be-a93d-4df9-a4b8-79ddf2c8f36b -langcode: fr -status: true -dependencies: - enforced: - module: - - filter - - rules -_core: - default_config_hash: VrFjOQn2l2n6baaj2Z6IkYt9OdtsLjYPUVg7HgkkGLU -name: 'HTML restreint' -format: restricted_html -weight: 1 -filters: - filter_html: - id: filter_html - provider: filter - status: true - weight: -10 - settings: - allowed_html: '