From 9d2c04272b920da7bb3b0101a30ab1149d1c4f66 Mon Sep 17 00:00:00 2001 From: Adrian Bateman Date: Thu, 3 Oct 2024 10:46:12 +0100 Subject: [PATCH 1/4] feat(ECCW-708): Export config from Prod for removal of Content Ownership. Add role Directory Editor. --- ....node.localgov_guides_overview.default.yml | 11 - ...play.node.localgov_guides_page.default.yml | 11 - ...ocalgov_publication_cover_page.default.yml | 10 + ...node.localgov_publication_page.default.yml | 10 + ...node.localgov_services_landing.default.yml | 12 +- ...ay.node.localgov_services_page.default.yml | 21 +- ....node.localgov_guides_overview.default.yml | 2 - ...ode.localgov_guides_overview.grid_item.yml | 2 - ....localgov_guides_overview.search_index.yml | 2 - ...localgov_guides_overview.search_result.yml | 2 - ...y.node.localgov_guides_overview.teaser.yml | 2 - ...play.node.localgov_guides_page.default.yml | 13 +- ...node.localgov_guides_page.search_index.yml | 2 - ...ode.localgov_guides_page.search_result.yml | 2 - ...splay.node.localgov_guides_page.teaser.yml | 2 - ...node.localgov_services_landing.default.yml | 2 - ...ay.node.localgov_services_landing.full.yml | 2 - ...de.localgov_services_landing.grid_item.yml | 2 - ...localgov_services_landing.search_index.yml | 2 - ...ocalgov_services_landing.search_result.yml | 2 - ....node.localgov_services_landing.teaser.yml | 2 - ...ay.node.localgov_services_page.default.yml | 2 - ....node.localgov_services_page.grid_item.yml | 2 - ...de.localgov_services_page.search_index.yml | 2 - ...e.localgov_services_page.search_result.yml | 2 - ...lay.node.localgov_services_page.teaser.yml | 2 - config/default/core.extension.yml | 1 - ...ov_guides_overview.field_content_owner.yml | 25 -- ...calgov_guides_page.field_content_owner.yml | 25 -- ...v_services_landing.field_content_owner.yml | 25 -- ...lgov_services_page.field_content_owner.yml | 25 -- ...field.storage.node.field_content_owner.yml | 20 -- ...g.content_owner_sme--content_owner_sme.yml | 59 ----- ...e.type.localgov_publication_cover_page.yml | 1 + .../node.type.localgov_publication_page.yml | 1 + config/default/system.maintenance.yml | 2 +- config/default/user.role.authenticated.yml | 2 - config/default/user.role.directory_editor.yml | 108 +++++++++ config/default/user.role.localgov_author.yml | 2 - .../user.role.localgov_contributor.yml | 2 - config/default/user.role.localgov_editor.yml | 8 +- config/default/views.settings.yml | 1 - .../default/views.view.content_ownership.yml | 225 ------------------ config/default/views.view.documents.yml | 2 +- .../views.view.localgov_sitewide_search.yml | 2 +- ...ew.publication_entity_reference_widget.yml | 2 +- config/default/views.view.publications.yml | 2 +- 47 files changed, 167 insertions(+), 499 deletions(-) delete mode 100644 config/default/field.field.node.localgov_guides_overview.field_content_owner.yml delete mode 100644 config/default/field.field.node.localgov_guides_page.field_content_owner.yml delete mode 100644 config/default/field.field.node.localgov_services_landing.field_content_owner.yml delete mode 100644 config/default/field.field.node.localgov_services_page.field_content_owner.yml delete mode 100644 config/default/field.storage.node.field_content_owner.yml delete mode 100644 config/default/jsonapi_extras.jsonapi_resource_config.content_owner_sme--content_owner_sme.yml create mode 100644 config/default/user.role.directory_editor.yml delete mode 100644 config/default/views.view.content_ownership.yml diff --git a/config/default/core.entity_form_display.node.localgov_guides_overview.default.yml b/config/default/core.entity_form_display.node.localgov_guides_overview.default.yml index 66d3b466..cb878397 100644 --- a/config/default/core.entity_form_display.node.localgov_guides_overview.default.yml +++ b/config/default/core.entity_form_display.node.localgov_guides_overview.default.yml @@ -5,7 +5,6 @@ dependencies: config: - entity_browser.browser.page_components - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -62,16 +61,6 @@ content: region: content settings: { } third_party_settings: { } - field_content_owner: - type: entity_reference_autocomplete - weight: 17 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } field_non_publishable_notes: type: text_textarea weight: 18 diff --git a/config/default/core.entity_form_display.node.localgov_guides_page.default.yml b/config/default/core.entity_form_display.node.localgov_guides_page.default.yml index 37bd04e6..afe9a582 100644 --- a/config/default/core.entity_form_display.node.localgov_guides_page.default.yml +++ b/config/default/core.entity_form_display.node.localgov_guides_page.default.yml @@ -5,7 +5,6 @@ dependencies: config: - entity_browser.browser.page_components - field.field.node.localgov_guides_page.body - - field.field.node.localgov_guides_page.field_content_owner - field.field.node.localgov_guides_page.field_non_publishable_notes - field.field.node.localgov_guides_page.field_publish_with_parent - field.field.node.localgov_guides_page.localgov_guides_parent @@ -58,16 +57,6 @@ content: region: content settings: { } third_party_settings: { } - field_content_owner: - type: entity_reference_autocomplete - weight: 7 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } field_non_publishable_notes: type: text_textarea weight: 8 diff --git a/config/default/core.entity_form_display.node.localgov_publication_cover_page.default.yml b/config/default/core.entity_form_display.node.localgov_publication_cover_page.default.yml index 6d24f475..e9a3111e 100644 --- a/config/default/core.entity_form_display.node.localgov_publication_cover_page.default.yml +++ b/config/default/core.entity_form_display.node.localgov_publication_cover_page.default.yml @@ -145,6 +145,16 @@ content: region: content settings: { } third_party_settings: { } + localgov_service_contacts: + type: entity_reference_autocomplete + weight: 101 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } localgov_updated_date: type: datetime_default weight: 5 diff --git a/config/default/core.entity_form_display.node.localgov_publication_page.default.yml b/config/default/core.entity_form_display.node.localgov_publication_page.default.yml index d47fc5d0..9eb42e30 100644 --- a/config/default/core.entity_form_display.node.localgov_publication_page.default.yml +++ b/config/default/core.entity_form_display.node.localgov_publication_page.default.yml @@ -43,6 +43,16 @@ content: region: content settings: { } third_party_settings: { } + localgov_service_contacts: + type: entity_reference_autocomplete + weight: 101 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } localgov_updated_date: type: datetime_default weight: 10 diff --git a/config/default/core.entity_form_display.node.localgov_services_landing.default.yml b/config/default/core.entity_form_display.node.localgov_services_landing.default.yml index cf00829e..8ea1fdd5 100644 --- a/config/default/core.entity_form_display.node.localgov_services_landing.default.yml +++ b/config/default/core.entity_form_display.node.localgov_services_landing.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -200,6 +199,16 @@ content: region: content settings: { } third_party_settings: { } + localgov_service_contacts: + type: entity_reference_autocomplete + weight: 26 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } localgov_services_navigation_children: weight: 1 region: content @@ -278,7 +287,6 @@ content: third_party_settings: { } hidden: entitygroupfield: true - field_content_owner: true localgov_address: true localgov_address_first_line: true localgov_facebook: true diff --git a/config/default/core.entity_form_display.node.localgov_services_page.default.yml b/config/default/core.entity_form_display.node.localgov_services_page.default.yml index 1771c394..1e6337e3 100644 --- a/config/default/core.entity_form_display.node.localgov_services_page.default.yml +++ b/config/default/core.entity_form_display.node.localgov_services_page.default.yml @@ -5,7 +5,6 @@ dependencies: config: - entity_browser.browser.page_components - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -132,16 +131,6 @@ content: region: content settings: { } third_party_settings: { } - field_content_owner: - type: entity_reference_autocomplete - weight: 13 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } field_non_publishable_notes: type: text_textarea weight: 14 @@ -200,6 +189,16 @@ content: region: content settings: { } third_party_settings: { } + localgov_service_contacts: + type: entity_reference_autocomplete + weight: 26 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } localgov_services_parent: type: entity_reference_autocomplete weight: 2 diff --git a/config/default/core.entity_view_display.node.localgov_guides_overview.default.yml b/config/default/core.entity_view_display.node.localgov_guides_overview.default.yml index 3b957d79..176267e6 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_overview.default.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_overview.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -48,7 +47,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true localgov_guides_description: true localgov_guides_list_format: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_overview.grid_item.yml b/config/default/core.entity_view_display.node.localgov_guides_overview.grid_item.yml index 17390697..cd6fbb2c 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_overview.grid_item.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_overview.grid_item.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.grid_item - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -35,7 +34,6 @@ hidden: body: true content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_guides_list_format: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_overview.search_index.yml b/config/default/core.entity_view_display.node.localgov_guides_overview.search_index.yml index b4a8debb..e61f6615 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_overview.search_index.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_overview.search_index.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_index - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -74,7 +73,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_guides_list_format: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_overview.search_result.yml b/config/default/core.entity_view_display.node.localgov_guides_overview.search_result.yml index 03644d68..cac8c624 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_overview.search_result.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_overview.search_result.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_result - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -36,7 +35,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_guides_description: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_overview.teaser.yml b/config/default/core.entity_view_display.node.localgov_guides_overview.teaser.yml index c746e705..c9acbd77 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_overview.teaser.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_overview.teaser.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.localgov_guides_overview.body - - field.field.node.localgov_guides_overview.field_content_owner - field.field.node.localgov_guides_overview.field_non_publishable_notes - field.field.node.localgov_guides_overview.localgov_guides_description - field.field.node.localgov_guides_overview.localgov_guides_list_format @@ -35,7 +34,6 @@ hidden: body: true content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_guides_description: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_page.default.yml b/config/default/core.entity_view_display.node.localgov_guides_page.default.yml index 3277ec90..3665d31e 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_page.default.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_page.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.node.localgov_guides_page.body - - field.field.node.localgov_guides_page.field_content_owner - field.field.node.localgov_guides_page.field_non_publishable_notes - field.field.node.localgov_guides_page.field_publish_with_parent - field.field.node.localgov_guides_page.localgov_guides_parent @@ -28,6 +27,16 @@ content: third_party_settings: { } weight: 1 region: content + field_publish_with_parent: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 3 + region: content links: settings: { } third_party_settings: { } @@ -45,9 +54,7 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true - field_publish_with_parent: true localgov_guides_parent: true localgov_guides_section_title: true search_api_excerpt: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_page.search_index.yml b/config/default/core.entity_view_display.node.localgov_guides_page.search_index.yml index 007129a4..48f10995 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_page.search_index.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_page.search_index.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_index - field.field.node.localgov_guides_page.body - - field.field.node.localgov_guides_page.field_content_owner - field.field.node.localgov_guides_page.field_non_publishable_notes - field.field.node.localgov_guides_page.field_publish_with_parent - field.field.node.localgov_guides_page.localgov_guides_parent @@ -48,7 +47,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true field_publish_with_parent: true links: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_page.search_result.yml b/config/default/core.entity_view_display.node.localgov_guides_page.search_result.yml index 1671b201..563d0afb 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_page.search_result.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_page.search_result.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_result - field.field.node.localgov_guides_page.body - - field.field.node.localgov_guides_page.field_content_owner - field.field.node.localgov_guides_page.field_non_publishable_notes - field.field.node.localgov_guides_page.field_publish_with_parent - field.field.node.localgov_guides_page.localgov_guides_parent @@ -33,7 +32,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true field_publish_with_parent: true links: true diff --git a/config/default/core.entity_view_display.node.localgov_guides_page.teaser.yml b/config/default/core.entity_view_display.node.localgov_guides_page.teaser.yml index a16ba067..14e6d3b0 100644 --- a/config/default/core.entity_view_display.node.localgov_guides_page.teaser.yml +++ b/config/default/core.entity_view_display.node.localgov_guides_page.teaser.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.localgov_guides_page.body - - field.field.node.localgov_guides_page.field_content_owner - field.field.node.localgov_guides_page.field_non_publishable_notes - field.field.node.localgov_guides_page.field_publish_with_parent - field.field.node.localgov_guides_page.localgov_guides_parent @@ -33,7 +32,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true field_publish_with_parent: true links: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.default.yml b/config/default/core.entity_view_display.node.localgov_services_landing.default.yml index 669f754a..40a1dc58 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.default.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -106,7 +105,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.full.yml b/config/default/core.entity_view_display.node.localgov_services_landing.full.yml index 107ade8f..dce6f78f 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.full.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.full.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.full - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -130,7 +129,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.grid_item.yml b/config/default/core.entity_view_display.node.localgov_services_landing.grid_item.yml index 0f3b28c1..3d951a62 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.grid_item.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.grid_item.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.grid_item - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -38,7 +37,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_address: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.search_index.yml b/config/default/core.entity_view_display.node.localgov_services_landing.search_index.yml index c27c5f73..0430576e 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.search_index.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.search_index.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_index - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -111,7 +110,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_services_parent: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.search_result.yml b/config/default/core.entity_view_display.node.localgov_services_landing.search_result.yml index 1b2493c2..15e76f43 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.search_result.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.search_result.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_result - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -38,7 +37,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_address: true diff --git a/config/default/core.entity_view_display.node.localgov_services_landing.teaser.yml b/config/default/core.entity_view_display.node.localgov_services_landing.teaser.yml index d6cae7a9..2def7f3f 100644 --- a/config/default/core.entity_view_display.node.localgov_services_landing.teaser.yml +++ b/config/default/core.entity_view_display.node.localgov_services_landing.teaser.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.localgov_services_landing.body - - field.field.node.localgov_services_landing.field_content_owner - field.field.node.localgov_services_landing.field_non_publishable_notes - field.field.node.localgov_services_landing.localgov_address - field.field.node.localgov_services_landing.localgov_address_first_line @@ -38,7 +37,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_address: true diff --git a/config/default/core.entity_view_display.node.localgov_services_page.default.yml b/config/default/core.entity_view_display.node.localgov_services_page.default.yml index c0b6c02e..93a7b018 100644 --- a/config/default/core.entity_view_display.node.localgov_services_page.default.yml +++ b/config/default/core.entity_view_display.node.localgov_services_page.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -44,7 +43,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.entity_view_display.node.localgov_services_page.grid_item.yml b/config/default/core.entity_view_display.node.localgov_services_page.grid_item.yml index 42679ab5..3950b44b 100644 --- a/config/default/core.entity_view_display.node.localgov_services_page.grid_item.yml +++ b/config/default/core.entity_view_display.node.localgov_services_page.grid_item.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.grid_item - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -37,7 +36,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.entity_view_display.node.localgov_services_page.search_index.yml b/config/default/core.entity_view_display.node.localgov_services_page.search_index.yml index a6c9fe61..cdd7ca68 100644 --- a/config/default/core.entity_view_display.node.localgov_services_page.search_index.yml +++ b/config/default/core.entity_view_display.node.localgov_services_page.search_index.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_index - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -98,7 +97,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_hide_related_topics: true diff --git a/config/default/core.entity_view_display.node.localgov_services_page.search_result.yml b/config/default/core.entity_view_display.node.localgov_services_page.search_result.yml index def1e355..45045127 100644 --- a/config/default/core.entity_view_display.node.localgov_services_page.search_result.yml +++ b/config/default/core.entity_view_display.node.localgov_services_page.search_result.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.search_result - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -37,7 +36,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.entity_view_display.node.localgov_services_page.teaser.yml b/config/default/core.entity_view_display.node.localgov_services_page.teaser.yml index dc198bf5..ba275775 100644 --- a/config/default/core.entity_view_display.node.localgov_services_page.teaser.yml +++ b/config/default/core.entity_view_display.node.localgov_services_page.teaser.yml @@ -5,7 +5,6 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.localgov_services_page.body - - field.field.node.localgov_services_page.field_content_owner - field.field.node.localgov_services_page.field_non_publishable_notes - field.field.node.localgov_services_page.localgov_common_tasks - field.field.node.localgov_services_page.localgov_download_links @@ -37,7 +36,6 @@ content: hidden: content_moderation_control: true entitygroupfield: true - field_content_owner: true field_non_publishable_notes: true links: true localgov_common_tasks: true diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 8f4c77db..53f1e1c7 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -24,7 +24,6 @@ module: content_access_by_path: 0 content_access_by_path_admin_content: 0 content_moderation: 0 - content_ownership: 0 contextual: 0 crop: 0 ctools: 0 diff --git a/config/default/field.field.node.localgov_guides_overview.field_content_owner.yml b/config/default/field.field.node.localgov_guides_overview.field_content_owner.yml deleted file mode 100644 index 511aea7f..00000000 --- a/config/default/field.field.node.localgov_guides_overview.field_content_owner.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 718f357e-f29a-4aca-9f26-c1d7574613bc -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_content_owner - - node.type.localgov_guides_overview -id: node.localgov_guides_overview.field_content_owner -field_name: field_content_owner -entity_type: node -bundle: localgov_guides_overview -label: 'Content Owner' -description: "For assigning a content 'Owner'" -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: content_ownership - display_name: entity_reference_content_owner - arguments: { } -field_type: entity_reference diff --git a/config/default/field.field.node.localgov_guides_page.field_content_owner.yml b/config/default/field.field.node.localgov_guides_page.field_content_owner.yml deleted file mode 100644 index cd5ed012..00000000 --- a/config/default/field.field.node.localgov_guides_page.field_content_owner.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 7c041c2f-4691-4143-ac37-c87b1063a734 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_content_owner - - node.type.localgov_guides_page -id: node.localgov_guides_page.field_content_owner -field_name: field_content_owner -entity_type: node -bundle: localgov_guides_page -label: 'Content Owner' -description: "For assigning content 'Owners'" -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: content_ownership - display_name: entity_reference_content_owner - arguments: { } -field_type: entity_reference diff --git a/config/default/field.field.node.localgov_services_landing.field_content_owner.yml b/config/default/field.field.node.localgov_services_landing.field_content_owner.yml deleted file mode 100644 index 81b74346..00000000 --- a/config/default/field.field.node.localgov_services_landing.field_content_owner.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 087cad4e-8a6c-4bf7-ad1a-5d41b69aa157 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_content_owner - - node.type.localgov_services_landing -id: node.localgov_services_landing.field_content_owner -field_name: field_content_owner -entity_type: node -bundle: localgov_services_landing -label: 'Content Owner' -description: "For assigning content 'Owners'" -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: content_ownership - display_name: entity_reference_content_owner - arguments: { } -field_type: entity_reference diff --git a/config/default/field.field.node.localgov_services_page.field_content_owner.yml b/config/default/field.field.node.localgov_services_page.field_content_owner.yml deleted file mode 100644 index 105f678b..00000000 --- a/config/default/field.field.node.localgov_services_page.field_content_owner.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 13aee394-c257-4a30-bf32-095eb0e516ec -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_content_owner - - node.type.localgov_services_page -id: node.localgov_services_page.field_content_owner -field_name: field_content_owner -entity_type: node -bundle: localgov_services_page -label: 'Content Owner' -description: "For assigning content 'Owners'" -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: content_ownership - display_name: entity_reference_content_owner - arguments: { } -field_type: entity_reference diff --git a/config/default/field.storage.node.field_content_owner.yml b/config/default/field.storage.node.field_content_owner.yml deleted file mode 100644 index 4004859b..00000000 --- a/config/default/field.storage.node.field_content_owner.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 031a3369-20a5-4b36-b112-37973dbcb501 -langcode: en -status: true -dependencies: - module: - - content_ownership - - node -id: node.field_content_owner -field_name: field_content_owner -entity_type: node -type: entity_reference -settings: - target_type: content_owner_sme -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/default/jsonapi_extras.jsonapi_resource_config.content_owner_sme--content_owner_sme.yml b/config/default/jsonapi_extras.jsonapi_resource_config.content_owner_sme--content_owner_sme.yml deleted file mode 100644 index e3413d5d..00000000 --- a/config/default/jsonapi_extras.jsonapi_resource_config.content_owner_sme--content_owner_sme.yml +++ /dev/null @@ -1,59 +0,0 @@ -uuid: 432ff3b0-6966-4762-bf85-77936e05c8b8 -langcode: en -status: true -dependencies: - module: - - content_ownership -id: content_owner_sme--content_owner_sme -disabled: true -path: content_owner_sme/content_owner_sme -resourceType: content_owner_sme--content_owner_sme -resourceFields: - id: - disabled: false - fieldName: id - publicName: id - enhancer: - id: '' - uuid: - disabled: false - fieldName: uuid - publicName: uuid - enhancer: - id: '' - langcode: - disabled: false - fieldName: langcode - publicName: langcode - enhancer: - id: '' - name: - disabled: false - fieldName: name - publicName: name - enhancer: - id: '' - email: - disabled: false - fieldName: email - publicName: email - enhancer: - id: '' - role: - disabled: false - fieldName: role - publicName: role - enhancer: - id: '' - notes: - disabled: false - fieldName: notes - publicName: notes - enhancer: - id: '' - metatag: - disabled: false - fieldName: metatag - publicName: metatag - enhancer: - id: '' diff --git a/config/default/node.type.localgov_publication_cover_page.yml b/config/default/node.type.localgov_publication_cover_page.yml index 4d109034..4b2af328 100644 --- a/config/default/node.type.localgov_publication_cover_page.yml +++ b/config/default/node.type.localgov_publication_cover_page.yml @@ -13,6 +13,7 @@ third_party_settings: - main - subsites - subsites + - subsites parent: 'main:' _core: default_config_hash: SBbDjARv7P-kt6MCqejARLNTWAq3an2vZN7baCF0plY diff --git a/config/default/node.type.localgov_publication_page.yml b/config/default/node.type.localgov_publication_page.yml index 5362f488..a98e747a 100644 --- a/config/default/node.type.localgov_publication_page.yml +++ b/config/default/node.type.localgov_publication_page.yml @@ -13,6 +13,7 @@ third_party_settings: - main - subsites - subsites + - subsites parent: 'main:' _core: default_config_hash: EqOB_MmMweTE3kr1PbugDppS27uYrJpf0gvgkgd3mMQ diff --git a/config/default/system.maintenance.yml b/config/default/system.maintenance.yml index 65a36d20..3ac32b02 100644 --- a/config/default/system.maintenance.yml +++ b/config/default/system.maintenance.yml @@ -1,4 +1,4 @@ _core: default_config_hash: 1SNdA25INsV5YjlgAJtfC-6AM8VcWe_00xneMLb2yFg langcode: en -message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.' +message: '@site website is currently under maintenance. We should be back shortly. Thank you for your patience.' diff --git a/config/default/user.role.authenticated.yml b/config/default/user.role.authenticated.yml index bc11d598..31e5912f 100644 --- a/config/default/user.role.authenticated.yml +++ b/config/default/user.role.authenticated.yml @@ -9,7 +9,6 @@ dependencies: module: - cludo_search - content_moderation - - content_ownership - eu_cookie_compliance - file - filter @@ -39,7 +38,6 @@ permissions: - 'use text format wysiwyg' - 'view all localgov alert banner entities' - 'view any unpublished content' - - 'view content owner/sme entity' - 'view geo' - 'view latest version' - 'view localgov alert banner localgov_alert_banner entities' diff --git a/config/default/user.role.directory_editor.yml b/config/default/user.role.directory_editor.yml new file mode 100644 index 00000000..54ab9c00 --- /dev/null +++ b/config/default/user.role.directory_editor.yml @@ -0,0 +1,108 @@ +uuid: 85cbbb17-44c2-4794-acfa-7db433483f7f +langcode: en +status: true +dependencies: + config: + - node.type.localgov_directories_org + - node.type.localgov_directories_page + - node.type.localgov_directories_venue + - node.type.localgov_directory + - node.type.localgov_directory_promo_page + - node.type.localgov_event + - workflows.workflow.localgov_editorial + module: + - content_moderation + - ecc_content_moderation + - entity_browser + - facets + - field_ui + - file + - geo_entity + - help + - localgov_directories + - media + - node + - system + - toolbar +id: directory_editor +label: 'Directory editor' +weight: -1 +is_admin: null +permissions: + - 'access administration pages' + - 'access content overview' + - 'access directory facets overview' + - 'access files overview' + - 'access geo overview' + - 'access help pages' + - 'access media overview' + - 'access page_components entity browser pages' + - 'access paragraphs_library_items entity browser pages' + - 'access toolbar' + - 'administer display modes' + - 'administer facets' + - 'administer geo_entity display' + - 'administer geo_entity form display' + - 'administer localgov_directories_facets display' + - 'administer localgov_directories_facets form display' + - 'administer node display' + - 'administer node form display' + - 'administer user display' + - 'create geo' + - 'create localgov_directories_org content' + - 'create localgov_directories_page content' + - 'create localgov_directories_venue content' + - 'create localgov_directory_promo_page content' + - 'create localgov_event content' + - 'delete any localgov_directories_org content' + - 'delete any localgov_directories_page content' + - 'delete any localgov_directories_venue content' + - 'delete any localgov_directory_promo_page content' + - 'delete any localgov_event content' + - 'delete localgov_directories_org revisions' + - 'delete localgov_directories_page revisions' + - 'delete localgov_directories_venue revisions' + - 'delete localgov_directory_promo_page revisions' + - 'delete localgov_event revisions' + - 'delete own localgov_directories_org content' + - 'delete own localgov_directories_page content' + - 'delete own localgov_directories_venue content' + - 'delete own localgov_directory_promo_page content' + - 'delete own localgov_event content' + - 'edit any localgov_directories_org content' + - 'edit any localgov_directories_page content' + - 'edit any localgov_directories_venue content' + - 'edit any localgov_directory_promo_page content' + - 'edit any localgov_event content' + - 'edit geo' + - 'edit own localgov_directories_org content' + - 'edit own localgov_directories_page content' + - 'edit own localgov_directories_venue content' + - 'edit own localgov_directory_promo_page content' + - 'edit own localgov_event content' + - 'revert localgov_directories_org revisions' + - 'revert localgov_directories_page revisions' + - 'revert localgov_directories_venue revisions' + - 'revert localgov_directory revisions' + - 'revert localgov_directory_promo_page revisions' + - 'revert localgov_event revisions' + - 'use localgov_editorial transition approve' + - 'use localgov_editorial transition archive' + - 'use localgov_editorial transition archived_draft' + - 'use localgov_editorial transition archived_published' + - 'use localgov_editorial transition create_new_draft' + - 'use localgov_editorial transition publish' + - 'use localgov_editorial transition reject' + - 'use localgov_editorial transition submit_for_review' + - 'view any unpublished content' + - 'view directory facets' + - 'view entity moderation form' + - 'view geo' + - 'view latest version' + - 'view localgov_directories_org revisions' + - 'view localgov_directories_page revisions' + - 'view localgov_directories_venue revisions' + - 'view localgov_directory revisions' + - 'view localgov_directory_promo_page revisions' + - 'view localgov_event revisions' + - 'view the administration theme' diff --git a/config/default/user.role.localgov_author.yml b/config/default/user.role.localgov_author.yml index a4dc4b06..570b9864 100644 --- a/config/default/user.role.localgov_author.yml +++ b/config/default/user.role.localgov_author.yml @@ -28,7 +28,6 @@ dependencies: - workflows.workflow.localgov_editorial module: - content_moderation - - content_ownership - entity_browser - entity_hierarchy - entity_usage @@ -180,7 +179,6 @@ permissions: - 'view all scheduled transitions' - 'view any unpublished content' - 'view any webform submission' - - 'view content owner/sme entity' - 'view directory facets' - 'view latest version' - 'view localgov alert banner localgov_alert_banner pages' diff --git a/config/default/user.role.localgov_contributor.yml b/config/default/user.role.localgov_contributor.yml index c383d382..dbd8f651 100644 --- a/config/default/user.role.localgov_contributor.yml +++ b/config/default/user.role.localgov_contributor.yml @@ -28,7 +28,6 @@ dependencies: - workflows.workflow.localgov_editorial module: - content_moderation - - content_ownership - entity_browser - entity_hierarchy - entity_usage @@ -146,7 +145,6 @@ permissions: - 'view all scheduled transitions' - 'view any unpublished content' - 'view any webform submission' - - 'view content owner/sme entity' - 'view latest version' - 'view localgov alert banner localgov_alert_banner pages' - 'view localgov_directories_org revisions' diff --git a/config/default/user.role.localgov_editor.yml b/config/default/user.role.localgov_editor.yml index 17e0f04e..7f45664e 100644 --- a/config/default/user.role.localgov_editor.yml +++ b/config/default/user.role.localgov_editor.yml @@ -35,7 +35,6 @@ dependencies: module: - book - content_moderation - - content_ownership - entity_browser - entity_hierarchy - entity_usage @@ -72,6 +71,7 @@ is_admin: null permissions: - 'access administration pages' - 'access content overview' + - 'access directory facets overview' - 'access entity usage statistics' - 'access geo overview' - 'access geo_entity_library entity browser pages' @@ -84,7 +84,6 @@ permissions: - 'access taxonomy overview' - 'access toolbar' - 'access webform overview' - - 'add content owner/sme entity' - 'add content to books' - 'add scheduled transitions localgov_alert_banner localgov_alert_banner' - 'add scheduled transitions node localgov_directories_org' @@ -106,7 +105,6 @@ permissions: - 'add scheduled transitions node localgov_subsites_overview' - 'add scheduled transitions node localgov_subsites_page' - 'administer book outlines' - - 'administer content owner/sme entity' - 'administer localgov_service_contact' - 'administer menu' - 'administer paragraphs library' @@ -116,6 +114,7 @@ permissions: - 'create document media' - 'create geo' - 'create image media' + - 'create localgov_directory content' - 'create localgov_event content' - 'create localgov_guides_overview content' - 'create localgov_guides_page content' @@ -156,7 +155,6 @@ permissions: - 'delete any localgov_subsites_overview content' - 'delete any localgov_subsites_page content' - 'delete any media' - - 'delete content owner/sme entity' - 'delete geo' - 'delete localgov_event revisions' - 'delete localgov_publication_cover_page revisions' @@ -196,7 +194,6 @@ permissions: - 'edit any localgov_subsites_page content' - 'edit any remote_video media' - 'edit any webform' - - 'edit content owner/sme entity' - 'edit directory facets' - 'edit geo' - 'edit localgov_service_contact' @@ -293,7 +290,6 @@ permissions: - 'view all scheduled transitions' - 'view any unpublished content' - 'view any webform submission' - - 'view content owner/sme entity' - 'view directory facets' - 'view latest version' - 'view localgov alert banner localgov_alert_banner pages' diff --git a/config/default/views.settings.yml b/config/default/views.settings.yml index 41e166cd..c7688f92 100644 --- a/config/default/views.settings.yml +++ b/config/default/views.settings.yml @@ -45,4 +45,3 @@ field_rewrite_elements: ins: INS q: Q s: S -skip_cache: false diff --git a/config/default/views.view.content_ownership.yml b/config/default/views.view.content_ownership.yml deleted file mode 100644 index 19dc91ca..00000000 --- a/config/default/views.view.content_ownership.yml +++ /dev/null @@ -1,225 +0,0 @@ -uuid: 9bdbb8f5-26e7-45ff-931c-83312a312231 -langcode: en -status: true -dependencies: - module: - - content_ownership -id: content_ownership -label: 'Content Ownership' -module: views -description: '' -tag: '' -base_table: content_owner_sme -base_field: id -display: - default: - id: default - display_title: Default - display_plugin: default - position: 0 - display_options: - fields: - name: - id: name - table: content_owner_sme - field: name - relationship: none - group_type: group - admin_label: '' - entity_type: null - entity_field: name - plugin_id: field - 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: 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: 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 - pager: - type: mini - options: - offset: 0 - items_per_page: 10 - total_pages: null - id: 0 - tags: - next: ›› - previous: ‹‹ - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - pagination_heading_level: h4 - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - access: - type: none - options: { } - cache: - type: tag - options: { } - empty: { } - sorts: { } - arguments: { } - filters: - role: - id: role - table: content_owner_sme - field: role - relationship: none - group_type: group - admin_label: '' - entity_type: content_owner_sme - entity_field: role - plugin_id: string - operator: '=' - value: owner - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - placeholder: '' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - default_field_elements: true - inline: { } - separator: '' - hide_empty: false - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - relationships: { } - header: { } - footer: { } - display_extenders: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url.query_args - tags: { } - entity_reference_content_owner: - id: entity_reference_content_owner - display_title: 'Content Owner (Reference)' - display_plugin: entity_reference - position: 1 - display_options: - filters: { } - filter_groups: - operator: AND - groups: - 1: AND - style: - type: entity_reference - options: - search_fields: - name: name - defaults: - filters: false - filter_groups: false - display_description: '' - display_extenders: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - tags: { } diff --git a/config/default/views.view.documents.yml b/config/default/views.view.documents.yml index 1edb1a54..c5d5cd5d 100644 --- a/config/default/views.view.documents.yml +++ b/config/default/views.view.documents.yml @@ -79,6 +79,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -93,7 +94,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/config/default/views.view.localgov_sitewide_search.yml b/config/default/views.view.localgov_sitewide_search.yml index 0d52d4c3..389c49b6 100644 --- a/config/default/views.view.localgov_sitewide_search.yml +++ b/config/default/views.view.localgov_sitewide_search.yml @@ -84,6 +84,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -101,7 +102,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/config/default/views.view.publication_entity_reference_widget.yml b/config/default/views.view.publication_entity_reference_widget.yml index af075d84..51468d71 100644 --- a/config/default/views.view.publication_entity_reference_widget.yml +++ b/config/default/views.view.publication_entity_reference_widget.yml @@ -76,6 +76,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -90,7 +91,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/config/default/views.view.publications.yml b/config/default/views.view.publications.yml index 54fd9dbd..703789e1 100644 --- a/config/default/views.view.publications.yml +++ b/config/default/views.view.publications.yml @@ -247,6 +247,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -261,7 +262,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: From e23a5585bd75357b80f239949e8e0ba23998bf4e Mon Sep 17 00:00:00 2001 From: Adrian Bateman Date: Fri, 4 Oct 2024 09:01:15 +0100 Subject: [PATCH 2/4] feat(LP-152): Change banner_28_9, remove height from primary banner. --- composer.json | 2 +- composer.lock | 15 ++++++++------- .../responsive_image.styles.banner_28_9.yml | 14 ++++++++++---- config/envs/ddev/devel.settings.yml | 12 ------------ config/envs/ddev/devel.toolbar.settings.yml | 10 ---------- config/envs/ddev/system.menu.devel.yml | 13 ------------- config/envs/ddev/views.view.watchdog.yml | 2 +- 7 files changed, 20 insertions(+), 48 deletions(-) delete mode 100644 config/envs/ddev/devel.settings.yml delete mode 100644 config/envs/ddev/devel.toolbar.settings.yml delete mode 100644 config/envs/ddev/system.menu.devel.yml diff --git a/composer.json b/composer.json index f68ad448..125a837c 100644 --- a/composer.json +++ b/composer.json @@ -119,7 +119,7 @@ "essexcountycouncil/ecc_cookie_compliance": "^1.0", "essexcountycouncil/ecc_menu": "^1.0", "essexcountycouncil/ecc_parents": "^1.0", - "essexcountycouncil/ecc_theme": "^1.1", + "essexcountycouncil/ecc_theme": "dev-feature/LP-152", "localgovdrupal/localgov": "^3", "localgovdrupal/localgov_base": "^1.5", "localgovdrupal/localgov_content_access_control": "^1.0", diff --git a/composer.lock b/composer.lock index 9c01f2e0..af148bf9 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": "9e007137d5ba01c654a87a8de26d0f83", + "content-hash": "a9471ca21be354b5bd14bd6d8f256527", "packages": [ { "name": "asm89/stack-cors", @@ -9710,16 +9710,16 @@ }, { "name": "essexcountycouncil/ecc_theme", - "version": "1.1.7", + "version": "dev-feature/LP-152", "source": { "type": "git", "url": "https://github.com/essexcountycouncil/ecc_theme.git", - "reference": "d682c2e192d0ee7f62e99315c5f338acce18ba26" + "reference": "320e80b45cc78f7a9870af58b189a4296f817484" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/essexcountycouncil/ecc_theme/zipball/d682c2e192d0ee7f62e99315c5f338acce18ba26", - "reference": "d682c2e192d0ee7f62e99315c5f338acce18ba26", + "url": "https://api.github.com/repos/essexcountycouncil/ecc_theme/zipball/320e80b45cc78f7a9870af58b189a4296f817484", + "reference": "320e80b45cc78f7a9870af58b189a4296f817484", "shasum": "" }, "type": "drupal-theme", @@ -9731,10 +9731,10 @@ ], "description": "Consolidated Essex County Council Drupal theme", "support": { - "source": "https://github.com/essexcountycouncil/ecc_theme/tree/1.1.7", + "source": "https://github.com/essexcountycouncil/ecc_theme/tree/feature/LP-152", "issues": "https://github.com/essexcountycouncil/ecc_theme/issues" }, - "time": "2024-07-30T11:01:52+00:00" + "time": "2024-10-04T07:55:47+00:00" }, { "name": "ezyang/htmlpurifier", @@ -23435,6 +23435,7 @@ "drupal/preview_link": 15, "drupal/ultimate_cron": 15, "drupal/views_core_entity_reference": 15, + "essexcountycouncil/ecc_theme": 20, "localgovdrupal/localgov_forms": 10, "localgovdrupal/localgov_subsites_extras": 20 }, diff --git a/config/default/responsive_image.styles.banner_28_9.yml b/config/default/responsive_image.styles.banner_28_9.yml index f9e1cb03..1eca2192 100644 --- a/config/default/responsive_image.styles.banner_28_9.yml +++ b/config/default/responsive_image.styles.banner_28_9.yml @@ -4,8 +4,9 @@ status: true dependencies: config: - image.style.large_28_9 + - image.style.large_28_9_2x - image.style.medium_28_9 - - image.style.small_21_9 + - image.style.small_28_9 module: - localgov_media _core: @@ -15,9 +16,14 @@ label: 'Banner (28:9)' image_style_mappings: - image_mapping_type: image_style - image_mapping: large_28_9 + image_mapping: large_28_9_2x breakpoint_id: localgov_media.bootstrap4_xl_1200px multiplier: 1x + - + image_mapping_type: image_style + image_mapping: large_28_9 + breakpoint_id: localgov_media.bootstrap4_lg_992px + multiplier: 1x - image_mapping_type: image_style image_mapping: medium_28_9 @@ -25,8 +31,8 @@ image_style_mappings: multiplier: 1x - image_mapping_type: image_style - image_mapping: small_21_9 + image_mapping: small_28_9 breakpoint_id: localgov_media.bootstrap4_xs multiplier: 1x breakpoint_group: localgov_media -fallback_image_style: small_21_9 +fallback_image_style: small_28_9 diff --git a/config/envs/ddev/devel.settings.yml b/config/envs/ddev/devel.settings.yml deleted file mode 100644 index 976cc91f..00000000 --- a/config/envs/ddev/devel.settings.yml +++ /dev/null @@ -1,12 +0,0 @@ -_core: - default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo -page_alter: false -raw_names: false -error_handlers: - 1: 1 -rebuild_theme: false -debug_mail_file_format: '%to-%subject-%datetime.mail.txt' -debug_mail_directory: 'temporary://devel-mails' -devel_dumper: var_dumper -debug_logfile: 'temporary://drupal_debug.txt' -debug_pre: true diff --git a/config/envs/ddev/devel.toolbar.settings.yml b/config/envs/ddev/devel.toolbar.settings.yml deleted file mode 100644 index 76ada43c..00000000 --- a/config/envs/ddev/devel.toolbar.settings.yml +++ /dev/null @@ -1,10 +0,0 @@ -_core: - default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA -toolbar_items: - - devel.admin_settings_link - - devel.cache_clear - - devel.container_info.service - - devel.menu_rebuild - - devel.reinstall - - devel.route_info - - devel.run_cron diff --git a/config/envs/ddev/system.menu.devel.yml b/config/envs/ddev/system.menu.devel.yml deleted file mode 100644 index 089c53bb..00000000 --- a/config/envs/ddev/system.menu.devel.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: aae32930-de65-44f2-b518-7bfee7f5a996 -langcode: en -status: true -dependencies: - enforced: - module: - - devel -_core: - default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c -id: devel -label: Development -description: 'Links related to Devel module.' -locked: true diff --git a/config/envs/ddev/views.view.watchdog.yml b/config/envs/ddev/views.view.watchdog.yml index 390d5b8a..0b7bd067 100644 --- a/config/envs/ddev/views.view.watchdog.yml +++ b/config/envs/ddev/views.view.watchdog.yml @@ -440,6 +440,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -454,7 +455,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: From 8db04f268d5e0388908291971e514040cb3eb16c Mon Sep 17 00:00:00 2001 From: Adrian Bateman Date: Fri, 4 Oct 2024 09:06:52 +0100 Subject: [PATCH 3/4] feat(LP-142): Change ecc_theme branch. --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 125a837c..fc711e28 100644 --- a/composer.json +++ b/composer.json @@ -119,7 +119,7 @@ "essexcountycouncil/ecc_cookie_compliance": "^1.0", "essexcountycouncil/ecc_menu": "^1.0", "essexcountycouncil/ecc_parents": "^1.0", - "essexcountycouncil/ecc_theme": "dev-feature/LP-152", + "essexcountycouncil/ecc_theme": "dev-task/LP-142", "localgovdrupal/localgov": "^3", "localgovdrupal/localgov_base": "^1.5", "localgovdrupal/localgov_content_access_control": "^1.0", diff --git a/composer.lock b/composer.lock index af148bf9..a606d7b0 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": "a9471ca21be354b5bd14bd6d8f256527", + "content-hash": "efb00111f2ed2e649fb355af1428a887", "packages": [ { "name": "asm89/stack-cors", @@ -9710,7 +9710,7 @@ }, { "name": "essexcountycouncil/ecc_theme", - "version": "dev-feature/LP-152", + "version": "dev-task/LP-142", "source": { "type": "git", "url": "https://github.com/essexcountycouncil/ecc_theme.git", From 9246421fce5180f0b4ca1ee883ca5a06377ad786 Mon Sep 17 00:00:00 2001 From: Adrian Bateman Date: Fri, 4 Oct 2024 09:17:59 +0100 Subject: [PATCH 4/4] chore(): Update Diff. --- composer.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index a606d7b0..de86cde8 100644 --- a/composer.lock +++ b/composer.lock @@ -3889,21 +3889,22 @@ }, { "name": "drupal/diff", - "version": "1.3.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/diff.git", - "reference": "8.x-1.3" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "7a6e70546d97974600baffd0695105e88699744e" + "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "a104bf731a282f06ff0d5a7fb861c01b5b933765" }, "require": { - "drupal/core": "^9.3 || ^10", - "mkalkbrenner/php-htmldiff-advanced": "~0.0.8" + "drupal/core": "^10 || ^11", + "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", + "php": "^8.1" }, "require-dev": { "jangregor/phpstan-prophecy": "dev-master", @@ -3913,13 +3914,13 @@ "phpstan/phpstan-deprecation-rules": "*", "phpstan/phpstan-phpunit": "1.4.x-dev", "phpstan/phpstan-strict-rules": "^1@stable", - "previousnext/coding-standard": "^1" + "previousnext/coding-standard": "1.0.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1712883857", + "version": "8.x-1.8", + "datestamp": "1727892285", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy"