From 8c7037b66d7bdcb8fd843cc296d0476810f6ee99 Mon Sep 17 00:00:00 2001 From: bach Date: Fri, 26 Nov 2021 22:00:50 +0100 Subject: [PATCH] some fixes --- config/sync/block.block.headermenu.yml | 2 +- config/sync/block.block.logoeql.yml | 45 +++++++ config/sync/block.block.logogouv.yml | 2 +- ...splay.block_content.logo_block.default.yml | 3 +- ...ity_view_display.node.actualite.teaser.yml | 26 ++-- config/sync/page_manager.page.ressources.yml | 12 ++ ...ge_variant.actualites-panels_variant-0.yml | 19 +-- ...ge_variant.ressources-panels_variant-0.yml | 29 ++++ config/sync/structure_sync.data.yml | 66 ++++++++-- config/sync/views.view.actus_blocks_pages.yml | 124 +++++++++++++++++- 10 files changed, 281 insertions(+), 47 deletions(-) create mode 100644 config/sync/block.block.logoeql.yml create mode 100644 config/sync/page_manager.page.ressources.yml create mode 100644 config/sync/page_manager.page_variant.ressources-panels_variant-0.yml diff --git a/config/sync/block.block.headermenu.yml b/config/sync/block.block.headermenu.yml index 232efed..23e124b 100644 --- a/config/sync/block.block.headermenu.yml +++ b/config/sync/block.block.headermenu.yml @@ -12,7 +12,7 @@ dependencies: id: headermenu theme: eql region: header_top_left -weight: 1 +weight: -1 provider: null plugin: 'menu_block:header-menu' settings: diff --git a/config/sync/block.block.logoeql.yml b/config/sync/block.block.logoeql.yml new file mode 100644 index 0000000..df54ed6 --- /dev/null +++ b/config/sync/block.block.logoeql.yml @@ -0,0 +1,45 @@ +uuid: 71cdbd68-4c5a-4005-ad21-68f242d61dc9 +langcode: fr +status: true +dependencies: + content: + - 'block_content:logo_block:471ad4df-2ba5-4305-aadd-d7d733b9693e' + module: + - block_content + - context + theme: + - eql +id: logoeql +theme: eql +region: header_top_left +weight: -2 +provider: null +plugin: 'block_content:471ad4df-2ba5-4305-aadd-d7d733b9693e' +settings: + id: 'block_content:471ad4df-2ba5-4305-aadd-d7d733b9693e' + label: 'logo eql' + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: + context_all: + id: context_all + values: '' + negate: null + context: + id: context + values: '' + negate: null + user_status: + id: user_status + user_status: + viewing_profile: '0' + logged_viewing_profile: '0' + own_page_true: '0' + field_value: '0' + user_fields: uid + negate: false + context_mapping: + user: '@user.current_user_context:current_user' diff --git a/config/sync/block.block.logogouv.yml b/config/sync/block.block.logogouv.yml index 79cda99..eabf197 100644 --- a/config/sync/block.block.logogouv.yml +++ b/config/sync/block.block.logogouv.yml @@ -12,7 +12,7 @@ dependencies: id: logogouv theme: eql region: header_top_left -weight: 0 +weight: -3 provider: null plugin: 'block_content:c7d5e705-b1c9-41f0-af19-a54357bf64c4' settings: diff --git a/config/sync/core.entity_view_display.block_content.logo_block.default.yml b/config/sync/core.entity_view_display.block_content.logo_block.default.yml index 0f0473e..e8d48b1 100644 --- a/config/sync/core.entity_view_display.block_content.logo_block.default.yml +++ b/config/sync/core.entity_view_display.block_content.logo_block.default.yml @@ -6,6 +6,7 @@ dependencies: - block_content.type.logo_block - field.field.block_content.logo_block.field_link - field.field.block_content.logo_block.field_logo + - image.style.thumbnail module: - image - linked_field @@ -18,7 +19,7 @@ content: weight: 0 label: hidden settings: - image_style: '' + image_style: thumbnail image_link: '' third_party_settings: linked_field: diff --git a/config/sync/core.entity_view_display.node.actualite.teaser.yml b/config/sync/core.entity_view_display.node.actualite.teaser.yml index eec6120..921da3f 100644 --- a/config/sync/core.entity_view_display.node.actualite.teaser.yml +++ b/config/sync/core.entity_view_display.node.actualite.teaser.yml @@ -22,6 +22,14 @@ targetEntityType: node bundle: actualite mode: teaser content: + field_actu_type: + type: entity_reference_label + weight: 3 + region: content + label: hidden + settings: + link: false + third_party_settings: { } field_date: type: datetime_default weight: 2 @@ -33,7 +41,7 @@ content: third_party_settings: { } field_images: type: image_delta_formatter - weight: 0 + weight: 1 region: content label: hidden settings: @@ -42,23 +50,15 @@ content: image_link: content deltas_reversed: '0' third_party_settings: { } - field_sous_titre: - type: string - weight: 3 - region: content - label: hidden - settings: - link_to_entity: false - third_party_settings: { } links: - weight: 100 + weight: 4 + region: content settings: { } third_party_settings: { } - region: content title: label: hidden type: title - weight: -50 + weight: 0 region: content settings: tag: h2 @@ -67,10 +67,10 @@ content: hidden: body: true created: true - field_actu_type: true field_fichiers: true field_liens: true field_ress: true + field_sous_titre: true langcode: true search_api_excerpt: true uid: true diff --git a/config/sync/page_manager.page.ressources.yml b/config/sync/page_manager.page.ressources.yml new file mode 100644 index 0000000..622d066 --- /dev/null +++ b/config/sync/page_manager.page.ressources.yml @@ -0,0 +1,12 @@ +uuid: c197bb0d-071d-4003-92f0-d6b0f260f38b +langcode: fr +status: true +dependencies: { } +id: ressources +label: Ressources +description: '' +use_admin_theme: false +path: /ressources +access_logic: and +access_conditions: { } +parameters: { } diff --git a/config/sync/page_manager.page_variant.actualites-panels_variant-0.yml b/config/sync/page_manager.page_variant.actualites-panels_variant-0.yml index 1a3e638..e4eab27 100644 --- a/config/sync/page_manager.page_variant.actualites-panels_variant-0.yml +++ b/config/sync/page_manager.page_variant.actualites-panels_variant-0.yml @@ -13,27 +13,16 @@ label: Panels variant: panels_variant variant_settings: blocks: - ac52e43e-7415-4532-9e06-bca899df4767: - id: 'views_block:actus_blocks_pages-block_2' + e78a9cc4-b6b8-42d9-b290-a7425dd92e54: + id: 'views_block:actus_blocks_pages-block_4' label: '' provider: views - label_display: visible + label_display: '0' views_label: '' items_per_page: none region: content weight: 0 - uuid: ac52e43e-7415-4532-9e06-bca899df4767 - context_mapping: { } - 45c858a0-bbc8-48b9-a0aa-63ec7c84999a: - id: 'views_block:actus_blocks_pages-block_3' - label: '' - provider: views - label_display: visible - views_label: '' - items_per_page: none - region: content - weight: 0 - uuid: 45c858a0-bbc8-48b9-a0aa-63ec7c84999a + uuid: e78a9cc4-b6b8-42d9-b290-a7425dd92e54 context_mapping: { } id: panels_variant uuid: 5b87b741-5a98-4fda-b5c6-e3bae20d76e4 diff --git a/config/sync/page_manager.page_variant.ressources-panels_variant-0.yml b/config/sync/page_manager.page_variant.ressources-panels_variant-0.yml new file mode 100644 index 0000000..9ca2195 --- /dev/null +++ b/config/sync/page_manager.page_variant.ressources-panels_variant-0.yml @@ -0,0 +1,29 @@ +uuid: 4955be3d-59aa-41c3-afab-b9bd10cac1ae +langcode: fr +status: true +dependencies: + config: + - page_manager.page.ressources + module: + - panels +id: ressources-panels_variant-0 +label: Panels +variant: panels_variant +variant_settings: + blocks: { } + id: panels_variant + uuid: 3e681071-36ef-4e59-a40b-fff553c6a489 + label: null + weight: 0 + layout: layout_onecol + layout_settings: + label: '' + page_title: Ressources + storage_type: page_manager + storage_id: ressources-panels_variant-0 + builder: standard +page: ressources +weight: 0 +selection_criteria: { } +selection_logic: and +static_context: { } diff --git a/config/sync/structure_sync.data.yml b/config/sync/structure_sync.data.yml index 493b256..3f2d04b 100644 --- a/config/sync/structure_sync.data.yml +++ b/config/sync/structure_sync.data.yml @@ -21,6 +21,19 @@ taxonomies: parent: '0' uuid: 72d2b968-0581-4b4b-99d9-2e4ddfd360cc blocks: + - + info: 'Actualité Link' + langcode: fr + uuid: 3ee1f633-aaa7-4b4c-a42a-02206e26d3a2 + bundle: link + revision_id: null + rev_id_current: null + fields: + field_lien: + - + uri: 'internal:/actualites' + title: 'Voir toutes les actualités' + options: { } - info: 'logo gouv' langcode: fr @@ -36,24 +49,31 @@ blocks: options: { } field_logo: - - target_id: '4' + target_id: '45' alt: '' title: '' width: '92' height: '33' - - info: 'Actualité Link' + info: 'logo eql' langcode: fr - uuid: 3ee1f633-aaa7-4b4c-a42a-02206e26d3a2 - bundle: link + uuid: 471ad4df-2ba5-4305-aadd-d7d733b9693e + bundle: logo_block revision_id: null rev_id_current: null fields: - field_lien: + field_link: - - uri: 'internal:/actualites' - title: 'Voir toutes les actualités' + uri: 'internal:/' + title: '' options: { } + field_logo: + - + target_id: '46' + alt: '' + title: '' + width: '4592' + height: '4592' menus: - menu_name: header-menu @@ -64,7 +84,7 @@ menus: description: null enabled: '1' expanded: '1' - weight: '0' + weight: '-50' langcode: fr uuid: 846d1e85-d797-4ccd-9779-f8a55c3350a9 - @@ -76,7 +96,7 @@ menus: description: null enabled: '1' expanded: '0' - weight: '1' + weight: '-49' langcode: fr uuid: d277f356-74ba-4963-b8fd-7c67d49e524e - @@ -122,7 +142,7 @@ menus: uri: 'internal:/node/3' link_title: '' description: null - enabled: '1' + enabled: '0' expanded: '0' weight: '0' langcode: fr @@ -134,7 +154,7 @@ menus: uri: 'internal:/faq' link_title: '' description: null - enabled: '1' + enabled: '0' expanded: '0' weight: '1' langcode: fr @@ -247,3 +267,27 @@ menus: weight: '2' langcode: fr uuid: 1f10b8b7-05dd-4cc7-9dad-a94fe3bb2856 + - + menu_name: header-menu + title: 'Les actualités' + parent: null + uri: 'internal:/actualites' + link_title: '' + description: null + enabled: '1' + expanded: '0' + weight: '-47' + langcode: fr + uuid: 92db1d8f-22a2-436c-814f-8904338621ad + - + menu_name: header-menu + title: 'Les ressources' + parent: null + uri: 'internal:/ressources' + link_title: '' + description: null + enabled: '1' + expanded: '0' + weight: '-48' + langcode: fr + uuid: 4d296aca-5316-4106-828a-01624ca7853e diff --git a/config/sync/views.view.actus_blocks_pages.yml b/config/sync/views.view.actus_blocks_pages.yml index 4b64f43..5448746 100644 --- a/config/sync/views.view.actus_blocks_pages.yml +++ b/config/sync/views.view.actus_blocks_pages.yml @@ -6,9 +6,6 @@ dependencies: - core.entity_view_mode.node.teaser - node.type.actualite - taxonomy.vocabulary.actu_type - content: - - 'taxonomy_term:actu_type:72d2b968-0581-4b4b-99d9-2e4ddfd360cc' - - 'taxonomy_term:actu_type:95dcbd7e-7f1f-48ad-9bb1-42022a29b18d' module: - node - taxonomy @@ -38,7 +35,7 @@ display: type: views_query options: disable_sql_rewrite: false - distinct: false + distinct: true replica: false query_comment: '' query_tags: { } @@ -55,13 +52,14 @@ display: pager: type: some options: - items_per_page: 5 + items_per_page: 0 offset: 0 style: type: default row: type: 'entity:node' options: + relationship: none view_mode: teaser fields: title: @@ -220,6 +218,12 @@ display: title: 'Home actus' defaults: title: false + pager: false + pager: + type: some + options: + items_per_page: 5 + offset: 0 cache_metadata: max-age: -1 contexts: @@ -438,3 +442,113 @@ display: - 'user.node_grants:view' - user.permissions tags: { } + block_4: + display_plugin: block + id: block_4 + display_title: 'Bloc Actus All' + position: 2 + display_options: + display_extenders: + views_ef_fieldset: { } + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + type: + id: type + table: node_field_data + field: type + value: + actualite: actualite + entity_type: node + entity_field: type + plugin_id: bundle + expose: + operator_limit_selection: false + operator_list: { } + field_actu_type_target_id: + id: field_actu_type_target_id + table: node__field_actu_type + field: field_actu_type_target_id + relationship: none + group_type: group + admin_label: '' + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_actu_type_target_id_op + label: 'Type d''actualités' + description: '' + use_operator: false + operator: field_actu_type_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_actu_type_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + admin: '0' + root: '0' + user: '0' + editeur: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + type: select + limit: true + vid: actu_type + hierarchy: false + error_message: true + parent: 0 + level_labels: '' + force_deepest: false + save_lineage: false + hierarchy_depth: 0 + required_depth: 0 + plugin_id: taxonomy_index_tid + defaults: + filters: false + filter_groups: false + title: false + filter_groups: + operator: AND + groups: + 1: AND + display_description: '' + title: Actualités + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - user + - 'user.node_grants:view' + - user.permissions + tags: { }