From db83f0ea35e7017c2aab1445701d9b5ec2a42743 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:00:28 +0200 Subject: [PATCH 1/6] =?UTF-8?q?page=20ressource=20affich=C3=A9=20le=20sous?= =?UTF-8?q?-titre=20#1868?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ger.page_variant.node-panels_variant-5.yml | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/config/sync/page_manager.page_variant.node-panels_variant-5.yml b/config/sync/page_manager.page_variant.node-panels_variant-5.yml index 03f92bb6..e8bbe168 100644 --- a/config/sync/page_manager.page_variant.node-panels_variant-5.yml +++ b/config/sync/page_manager.page_variant.node-panels_variant-5.yml @@ -36,7 +36,7 @@ variant_settings: link_to_entity: false third_party_settings: { } region: second - weight: -1 + weight: -3 uuid: cc44ae59-b6ba-47d3-9224-1d6ef82de485 68ed5c37-232a-4554-b1e6-a598cc1b01d4: id: 'entity_field:node:body' @@ -52,7 +52,7 @@ variant_settings: settings: { } third_party_settings: { } region: second - weight: 4 + weight: 3 uuid: 68ed5c37-232a-4554-b1e6-a598cc1b01d4 d2a161df-e7fa-4cd7-8a6c-442702667034: id: 'entity_field:node:field_auteurs' @@ -68,7 +68,7 @@ variant_settings: settings: { } third_party_settings: { } region: second - weight: -2 + weight: -4 uuid: d2a161df-e7fa-4cd7-8a6c-442702667034 3019fd91-6735-471b-a429-005dd320f5bd: id: 'entity_field:node:field_collections' @@ -85,7 +85,7 @@ variant_settings: link: false third_party_settings: { } region: second - weight: 0 + weight: -1 uuid: 3019fd91-6735-471b-a429-005dd320f5bd f9eaed57-bcce-43db-a937-e44f84cde262: id: 'entity_field:node:field_image' @@ -103,7 +103,7 @@ variant_settings: image_style: very_large third_party_settings: { } region: second - weight: -3 + weight: -5 uuid: f9eaed57-bcce-43db-a937-e44f84cde262 11c9521f-c1c5-4a3a-b735-b013ea51b5d7: id: 'entity_field:node:field_programme' @@ -120,7 +120,7 @@ variant_settings: link: true third_party_settings: { } region: second - weight: -5 + weight: -7 uuid: 11c9521f-c1c5-4a3a-b735-b013ea51b5d7 6b899160-a218-4412-9aae-15bf077ffab8: id: 'entity_field:node:field_date_de_parution' @@ -138,7 +138,7 @@ variant_settings: format_type: html_date third_party_settings: { } region: second - weight: 1 + weight: 0 uuid: 6b899160-a218-4412-9aae-15bf077ffab8 6957b522-39a6-4094-a338-4908b79bd5dd: id: 'entity_field:node:field_theme' @@ -155,7 +155,7 @@ variant_settings: link: true third_party_settings: { } region: second - weight: 2 + weight: 1 uuid: 6957b522-39a6-4094-a338-4908b79bd5dd 5a3cd52c-80b0-48ab-ad5b-102a0572cc10: id: 'entity_field:node:field_type_de_ressource' @@ -172,7 +172,7 @@ variant_settings: link: false third_party_settings: { } region: second - weight: -4 + weight: -6 uuid: 5a3cd52c-80b0-48ab-ad5b-102a0572cc10 99f61c86-31f2-41b7-a344-f398bbae87a5: id: 'block_content:1911abcd-dd85-403d-8e6e-8621c9f2045a' @@ -221,7 +221,7 @@ variant_settings: height: 480 third_party_settings: { } region: second - weight: 3 + weight: 2 uuid: c80516af-557e-426b-ba94-dc32e53016e0 31cf12fb-4adf-489d-ae14-9f4fddcac1c4: id: 'entity_field:node:field_ressources_liees' @@ -278,6 +278,23 @@ variant_settings: region: third weight: -4 uuid: eb706a7a-211b-4ef8-84b7-b1a6a207879c + b4e55d8c-4700-45ba-9b04-f48ad1ff7f38: + id: 'entity_field:node:field_sous_titre' + label: 'Sous titre' + label_display: '0' + provider: ctools_block + context_mapping: + entity: node + formatter: + type: string + weight: 0 + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + region: second + weight: -2 + uuid: b4e55d8c-4700-45ba-9b04-f48ad1ff7f38 page_title: '' layout: layout_threecol_25_50_25 layout_settings: From 207e7919e7c4b91b02ad3b6bb3b31652a18db117 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:08:50 +0200 Subject: [PATCH 2/6] =?UTF-8?q?date=20=C3=89v=C3=AAnements=20dans=20menu?= =?UTF-8?q?=20et=20dans=20page=20de=20l'=C3=A9v=C3=A8nement=20#1915?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core.date_format.date_longue_sans_heure.yml | 8 ++++++++ ...mart_date.smart_date_format.full_date_only.yml | 15 +++++++++++++++ web/profiles/d8-starterkit-profile | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 config/sync/core.date_format.date_longue_sans_heure.yml create mode 100644 config/sync/smart_date.smart_date_format.full_date_only.yml diff --git a/config/sync/core.date_format.date_longue_sans_heure.yml b/config/sync/core.date_format.date_longue_sans_heure.yml new file mode 100644 index 00000000..d7dc7d51 --- /dev/null +++ b/config/sync/core.date_format.date_longue_sans_heure.yml @@ -0,0 +1,8 @@ +uuid: a565b29e-b73e-4fd8-ac0b-0757bfab7320 +langcode: fr +status: true +dependencies: { } +id: date_longue_sans_heure +label: 'Date longue sans heure' +locked: false +pattern: 'l j F Y' diff --git a/config/sync/smart_date.smart_date_format.full_date_only.yml b/config/sync/smart_date.smart_date_format.full_date_only.yml new file mode 100644 index 00000000..c2a1264a --- /dev/null +++ b/config/sync/smart_date.smart_date_format.full_date_only.yml @@ -0,0 +1,15 @@ +uuid: 3068773d-5003-4fc5-acba-7c08b726e713 +langcode: fr +status: true +dependencies: { } +id: full_date_only +label: 'Full date only' +date_format: 'l j F Y' +time_format: 'g:ia' +time_hour_format: ga +allday_label: 'All day' +separator: ' - ' +join: ', ' +ampm_reduce: '1' +date_first: '1' +site_time_toggle: '1' diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 5069345d..179aa994 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 5069345d9dffca8ff935d7a01d2bc97a1272f063 +Subproject commit 179aa994156fa9c986cf9eb9262872abb9c651a2 From 63266e618c1d1da1817f483bb06dbc65f8c9837e Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:09:47 +0200 Subject: [PATCH 3/6] =?UTF-8?q?date=20=C3=89v=C3=AAnements=20dans=20menu?= =?UTF-8?q?=20et=20dans=20page=20de=20l'=C3=A9v=C3=A8nement=20#1915?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/page_manager.page_variant.node-panels_variant-2.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/sync/page_manager.page_variant.node-panels_variant-2.yml b/config/sync/page_manager.page_variant.node-panels_variant-2.yml index 335ae090..a0aa89f3 100644 --- a/config/sync/page_manager.page_variant.node-panels_variant-2.yml +++ b/config/sync/page_manager.page_variant.node-panels_variant-2.yml @@ -88,9 +88,10 @@ variant_settings: label: hidden settings: timezone_override: '' - format: date_only + format: full_date_only force_chronological: false add_classes: false + time_wrapper: true third_party_settings: { } region: second weight: 0 From e52501e62d5233156c0ee698e591e6023be413b9 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:11:11 +0200 Subject: [PATCH 4/6] =?UTF-8?q?date=20=C3=89v=C3=AAnements=20dans=20menu?= =?UTF-8?q?=20et=20dans=20page=20de=20l'=C3=A9v=C3=A8nement=20#1915?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/sync/smart_date.smart_date_format.full_date_only.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sync/smart_date.smart_date_format.full_date_only.yml b/config/sync/smart_date.smart_date_format.full_date_only.yml index c2a1264a..05f983b8 100644 --- a/config/sync/smart_date.smart_date_format.full_date_only.yml +++ b/config/sync/smart_date.smart_date_format.full_date_only.yml @@ -5,8 +5,8 @@ dependencies: { } id: full_date_only label: 'Full date only' date_format: 'l j F Y' -time_format: 'g:ia' -time_hour_format: ga +time_format: '' +time_hour_format: '' allday_label: 'All day' separator: ' - ' join: ', ' From eaab5b7c9f2e5f6fb956656a08cb1c7ecfa0099e Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:15:52 +0200 Subject: [PATCH 5/6] ressources format date #1866 --- ...manager.page_variant.node-panels_variant-5.yml | 7 +++++-- .../smart_date.smart_date_format.moi_annee.yml | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 config/sync/smart_date.smart_date_format.moi_annee.yml diff --git a/config/sync/page_manager.page_variant.node-panels_variant-5.yml b/config/sync/page_manager.page_variant.node-panels_variant-5.yml index e8bbe168..c375acc2 100644 --- a/config/sync/page_manager.page_variant.node-panels_variant-5.yml +++ b/config/sync/page_manager.page_variant.node-panels_variant-5.yml @@ -130,12 +130,15 @@ variant_settings: context_mapping: entity: node formatter: - type: datetime_default + type: smartdate_default weight: 0 label: hidden settings: timezone_override: '' - format_type: html_date + format: moi_annee + force_chronological: false + add_classes: false + time_wrapper: false third_party_settings: { } region: second weight: 0 diff --git a/config/sync/smart_date.smart_date_format.moi_annee.yml b/config/sync/smart_date.smart_date_format.moi_annee.yml new file mode 100644 index 00000000..c2d8c701 --- /dev/null +++ b/config/sync/smart_date.smart_date_format.moi_annee.yml @@ -0,0 +1,15 @@ +uuid: 09783cbc-b23f-4eae-a0ec-c6872f56824d +langcode: fr +status: true +dependencies: { } +id: moi_annee +label: 'moi année' +date_format: 'M Y' +time_format: '' +time_hour_format: '' +allday_label: 'All day' +separator: ' - ' +join: ', ' +ampm_reduce: '1' +date_first: '1' +site_time_toggle: '1' From 4fe9b518c74779e816f6daa139529ebd9c8925a3 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 10 May 2022 14:17:17 +0200 Subject: [PATCH 6/6] ressources format date #1866 --- config/sync/smart_date.smart_date_format.moi_annee.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/smart_date.smart_date_format.moi_annee.yml b/config/sync/smart_date.smart_date_format.moi_annee.yml index c2d8c701..c2315932 100644 --- a/config/sync/smart_date.smart_date_format.moi_annee.yml +++ b/config/sync/smart_date.smart_date_format.moi_annee.yml @@ -4,7 +4,7 @@ status: true dependencies: { } id: moi_annee label: 'moi année' -date_format: 'M Y' +date_format: 'F Y' time_format: '' time_hour_format: '' allday_label: 'All day'