diff --git a/composer.json b/composer.json index 53ccb31c..5c6e75a7 100644 --- a/composer.json +++ b/composer.json @@ -40,6 +40,7 @@ "drupal/selective_better_exposed_filters": "2.x-dev@dev", "drupal/smart_date": "^3.1", "drupal/structure_sync": "^2.0", + "drupal/toc_filter": "^2.0", "drupal/video_embed_field": "^2.4", "geocoder-php/google-maps-provider": "^4.6", "geocoder-php/mapquest-provider": "^4.2", diff --git a/composer.lock b/composer.lock index 125fefc5..805668f1 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": "031fcb88faba70428c9f0ec049e89d3e", + "content-hash": "b76955c757957271a462d63d8790e146", "packages": [ { "name": "alchemy/zippy", @@ -8882,6 +8882,111 @@ "source": "https://git.drupalcode.org/project/synonyms" } }, + { + "name": "drupal/toc_api", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/toc_api.git", + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/toc_api-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "7e4a667e6e36249e6f6d7114f72a84c8b7bf9782" + }, + "require": { + "drupal/core": "^8.9 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0", + "datestamp": "1614301344", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jacob Rockowitz (jrockowitz)", + "homepage": "https://www.drupal.org/u/jrockowitz", + "role": "Maintainer" + }, + { + "name": "jrockowitz", + "homepage": "https://www.drupal.org/user/371407" + } + ], + "description": "API for building a a hierarchical table of contents from header tags.", + "homepage": "https://drupal.org/project/toc_api", + "support": { + "source": "http://cgit.drupalcode.org/toc_api", + "issues": "https://drupal.org/project/issues/toc_api" + } + }, + { + "name": "drupal/toc_filter", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/toc_filter.git", + "reference": "8.x-2.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/toc_filter-8.x-2.0.zip", + "reference": "8.x-2.0", + "shasum": "6121a04480675b980b3161a975bf313dd68fefa3" + }, + "require": { + "drupal/core": "^8.9 || ^9", + "drupal/toc_api": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.0", + "datestamp": "1614304101", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jacob Rockowitz (jrockowitz)", + "homepage": "https://www.drupal.org/u/jrockowitz", + "role": "Maintainer" + }, + { + "name": "jrockowitz", + "homepage": "https://www.drupal.org/user/371407" + }, + { + "name": "yukare", + "homepage": "https://www.drupal.org/user/889254" + } + ], + "description": "Converts header tags into a hierarchical table of contents.", + "homepage": "https://drupal.org/project/toc_filter", + "support": { + "source": "http://cgit.drupalcode.org/toc_filter", + "issues": "https://drupal.org/project/issues/toc_filter" + } + }, { "name": "drupal/token", "version": "1.9.0", @@ -15339,5 +15444,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" } diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 8e146724..8a273980 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -125,6 +125,8 @@ module: taxonomy: 0 telephone: 0 text: 0 + toc_api: 0 + toc_filter: 0 token: 0 toolbar: 0 translation_views: 0 diff --git a/config/sync/linkit.linkit_profile.default.yml b/config/sync/linkit.linkit_profile.default.yml index 0f5d9699..d3448013 100644 --- a/config/sync/linkit.linkit_profile.default.yml +++ b/config/sync/linkit.linkit_profile.default.yml @@ -7,7 +7,7 @@ dependencies: _core: default_config_hash: Tt8DtxZ3Nooo0PoWPpJvszA3R_5d8MmpUW7LM_R-BzY id: default -label: 'Par défaut' +label: Default description: 'A default Linkit profile' matchers: 556010a3-e317-48b3-b4ed-854c10f4b950: diff --git a/config/sync/page_manager.page_variant.node-panels_variant-0.yml b/config/sync/page_manager.page_variant.node-panels_variant-0.yml index f5173a01..c9438139 100644 --- a/config/sync/page_manager.page_variant.node-panels_variant-0.yml +++ b/config/sync/page_manager.page_variant.node-panels_variant-0.yml @@ -35,8 +35,8 @@ variant_settings: label_display: visible views_label: '' items_per_page: none - region: bottom - weight: 0 + region: third + weight: -3 uuid: 9cfdc064-b1d5-4922-a7b6-fcd95c13f506 context_mapping: { } 286723b9-60de-46d0-9891-42e0910e604d: @@ -47,7 +47,7 @@ variant_settings: views_label: '' items_per_page: none region: third - weight: -1 + weight: -4 uuid: 286723b9-60de-46d0-9891-42e0910e604d context_mapping: { } 6319006a-015c-459c-996b-79d404f7455f: diff --git a/config/sync/pagerer.preset.default.yml b/config/sync/pagerer.preset.default.yml index d2caa175..edc01f4f 100644 --- a/config/sync/pagerer.preset.default.yml +++ b/config/sync/pagerer.preset.default.yml @@ -5,7 +5,7 @@ dependencies: { } _core: default_config_hash: iqELjKI7buiSyUfLs0cgSDbx7dvVI2StrGj0OaNLgSo id: default -label: 'Par défaut' +label: Default panes: left: style: none diff --git a/config/sync/toc_api.toc_type.default.yml b/config/sync/toc_api.toc_type.default.yml new file mode 100644 index 00000000..2eedcdfc --- /dev/null +++ b/config/sync/toc_api.toc_type.default.yml @@ -0,0 +1,28 @@ +uuid: cdfb831b-a1ce-4076-a864-dd1ec33d1595 +langcode: fr +status: true +dependencies: { } +_core: + default_config_hash: 83pJ_ZhgrmuPELjG0kOnns7gEluWdqcuTj_itSDiHZA +id: default +label: Default +options: + template: responsive + title: 'Table of Contents' + block: false + header_count: 2 + header_min: 2 + header_max: 4 + header_allowed_tags: ' ' + header_id: title + header_id_prefix: section + top_label: 'Back to top' + top_min: 2 + top_max: 2 + number_path: true + number_path_separator: . + number_path_truncate: true + default: + number_type: decimal + number_prefix: '' + number_suffix: ') ' diff --git a/config/sync/toc_api.toc_type.full.yml b/config/sync/toc_api.toc_type.full.yml new file mode 100644 index 00000000..66e813db --- /dev/null +++ b/config/sync/toc_api.toc_type.full.yml @@ -0,0 +1,28 @@ +uuid: 1a460121-3e56-43ad-b04a-fbc91e66313c +langcode: fr +status: true +dependencies: { } +_core: + default_config_hash: 7YNyn424XViSzWz2f6xtb3h1NUaDilWg6jzjpxDZHVs +id: full +label: Full +options: + template: responsive + title: 'Table of Contents' + block: false + header_count: 2 + header_min: 2 + header_max: 4 + header_allowed_tags: ' ' + header_id: title + header_id_prefix: section + top_label: 'Back to top' + top_min: 2 + top_max: 2 + number_path: true + number_path_separator: . + number_path_truncate: true + default: + number_type: circle + number_prefix: '' + number_suffix: '' diff --git a/config/sync/toc_api.toc_type.full_numbered.yml b/config/sync/toc_api.toc_type.full_numbered.yml new file mode 100644 index 00000000..db624047 --- /dev/null +++ b/config/sync/toc_api.toc_type.full_numbered.yml @@ -0,0 +1,28 @@ +uuid: 0a2a8ae4-2257-4d44-8aad-aef3591ed2a8 +langcode: fr +status: true +dependencies: { } +_core: + default_config_hash: abPC92DMk5W6Pke3QdHmWCCZlAH-Z1uvE9QR4HObS8A +id: full_numbered +label: 'Full - Numbered' +options: + template: responsive + title: 'Table of Contents' + block: false + header_count: 2 + header_min: 2 + header_max: 4 + header_allowed_tags: ' ' + header_id: title + header_id_prefix: section + top_label: 'Back to top' + top_min: 2 + top_max: 2 + number_path: true + number_path_separator: . + number_path_truncate: true + default: + number_type: decimal + number_prefix: '' + number_suffix: ') ' diff --git a/config/sync/toc_api.toc_type.simple.yml b/config/sync/toc_api.toc_type.simple.yml new file mode 100644 index 00000000..cc133b23 --- /dev/null +++ b/config/sync/toc_api.toc_type.simple.yml @@ -0,0 +1,28 @@ +uuid: a976725a-f9bc-46c8-8ed6-7881d95d1198 +langcode: fr +status: true +dependencies: { } +_core: + default_config_hash: aZAINoM99XYsy0zIYq1FPVU3BsodMh5HvWapNRUfBCw +id: simple +label: Simple +options: + template: responsive + title: 'Table of Contents' + block: false + header_count: 2 + header_min: 2 + header_max: 2 + header_allowed_tags: ' ' + header_id: title + header_id_prefix: section + top_label: 'Back to top' + top_min: 2 + top_max: 2 + number_path: true + number_path_separator: . + number_path_truncate: true + default: + number_type: circle + number_prefix: '' + number_suffix: '' diff --git a/config/sync/toc_api.toc_type.simple_numbered.yml b/config/sync/toc_api.toc_type.simple_numbered.yml new file mode 100644 index 00000000..60ee7c60 --- /dev/null +++ b/config/sync/toc_api.toc_type.simple_numbered.yml @@ -0,0 +1,28 @@ +uuid: 86239872-4fd7-427d-990a-85f208e1c47c +langcode: fr +status: true +dependencies: { } +_core: + default_config_hash: xK7RCrrAkROE9mHGVn4EFplfWGYLIe44eEsCJBtaJpc +id: simple_numbered +label: 'Simple - Numbered' +options: + template: responsive + title: 'Table of Contents' + block: false + header_count: 2 + header_min: 2 + header_max: 2 + header_allowed_tags: ' ' + header_id: title + header_id_prefix: section + top_label: 'Back to top' + top_min: 2 + top_max: 2 + number_path: true + number_path_separator: . + number_path_truncate: true + default: + number_type: circle + number_prefix: '' + number_suffix: '' diff --git a/config/sync/views.view.centre_de_ressources.yml b/config/sync/views.view.centre_de_ressources.yml index 330cfb1d..2bb98b58 100644 --- a/config/sync/views.view.centre_de_ressources.yml +++ b/config/sync/views.view.centre_de_ressources.yml @@ -884,7 +884,7 @@ display: block_1: display_plugin: block id: block_1 - display_title: Bloc + display_title: 'Prog Ressources Bloc' position: 2 display_options: display_extenders: @@ -897,6 +897,8 @@ display: style: false row: false arguments: false + fields: false + pager: false block_description: 'Ressource associées' filters: status: @@ -984,21 +986,259 @@ display: break_phrase: false not: false plugin_id: numeric + display_description: '' + block_category: 'Prog Blocs (Views)' + fields: + field_type_de_ressource: + id: field_type_de_ressource + table: node__field_type_de_ressource + field: field_type_de_ressource + relationship: none + group_type: group + admin_label: '' + label: '' + 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: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + 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 + plugin_id: field + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + label: '' + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + exclude: 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_alter_empty: true + click_sort_column: value + type: string + 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 + field_sous_titre: + id: field_sous_titre + table: node__field_sous_titre + field: field_sous_titre + relationship: none + group_type: group + admin_label: '' + label: '' + 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: value + type: string + settings: + link_to_entity: false + 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 + plugin_id: field + body: + id: body + table: node__body + field: body + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: true + 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: value + type: text_default + 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 + plugin_id: field + pager: + type: none + options: + offset: 0 cache_metadata: max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - - url.query_args - 'user.node_grants:view' - user.permissions tags: - 'config:field.storage.node.body' - - 'config:field.storage.node.field_image' - - 'config:field.storage.node.field_programme' - 'config:field.storage.node.field_sous_titre' - - 'config:field.storage.node.field_theme' - 'config:field.storage.node.field_type_de_ressource' page_1: display_plugin: page diff --git a/config/sync/views.view.evenements.yml b/config/sync/views.view.evenements.yml index 96b6d208..d27b0511 100644 --- a/config/sync/views.view.evenements.yml +++ b/config/sync/views.view.evenements.yml @@ -13,7 +13,7 @@ dependencies: - text - user id: evenements -label: Événements +label: 'Prog Événements' module: views description: '' tag: '' @@ -414,7 +414,9 @@ display: display_title: Block position: 1 display_options: - display_extenders: { } + display_extenders: + views_ef_fieldset: { } + block_category: 'Prog Blocs (Views)' cache_metadata: max-age: -1 contexts: diff --git a/web/sites/development.services.yml b/web/sites/development.services.yml index 676b210c..d2857c66 100644 --- a/web/sites/development.services.yml +++ b/web/sites/development.services.yml @@ -4,46 +4,6 @@ # 'example.settings.local.php' file, which sits next to this file. parameters: http.response.debug_cacheability_headers: true - 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. - # - # 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. - # - # Not recommended in production environments - # @default null - auto_reload: true - # 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. - # - # Not recommended in production environments - # @default true - cache: false services: cache.backend.null: class: Drupal\Core\Cache\NullBackendFactory