Merge branch '8.x-1.x' into feature/ISTWCMS-4208-ebremner-unpublishing

config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_blogs-blogs_listing_block.yml

+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_blogs-blogs_listing_block
+block_id: 'views_block:uw_view_blogs-blogs_listing_block'
+category: uw_bc_listings
+label: 'Blog post list'
+weight: -2
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/bloglist.svg
+image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_events-events_listing_block.yml

+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_events-events_listing_block
+block_id: 'views_block:uw_view_events-events_listing_block'
+category: uw_bc_listings
+label: 'Event list'
+weight: -1
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventlist.svg
+image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_news_items-news_items_listing_block.yml

+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_news_items-news_items_listing_block
+block_id: 'views_block:uw_view_news_items-news_items_listing_block'
+category: uw_bc_listings
+label: 'News item list'
+weight: 1
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newslist.svg
+image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_block.webform_block.yml

+langcode: en
+status: true
+dependencies: {  }
+id: webform_block
+block_id: webform_block
+category: uw_bc_webforms
+label: Webform
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/webform.svg
+image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_content.yml

@@ -20,11 +20,6 @@ blocks:
     weight: 0
     image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/copytext.svg
     image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_expand_collapse'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/expandcollapse.svg
-    image_alt: ''
   -
     block_id: 'inline_block:uw_cbl_facts_and_figures'
     weight: 0

config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_external_embeds.yml

@@ -4,39 +4,3 @@ dependencies: {  }
 id: uw_bc_external_embeds
 label: 'External embeds'
 weight: null
-blocks:
-  -
-    block_id: 'inline_block:uw_cbl_facebook'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/facebook.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_instagram'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/instagram.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_remote_video'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/video.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_tableau'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/tableau.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_twitter'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/twitter.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_powerbi'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/powerbi.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_google_maps'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/maps_google.svg
-    image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_listings.yml

@@ -4,24 +4,3 @@ dependencies: {  }
 id: uw_bc_listings
 label: Listings
 weight: null
-blocks:
-  -
-    block_id: 'views_block:uw_view_blogs-blogs_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/bloglist.svg
-    image_alt: ''
-  -
-    block_id: 'views_block:uw_view_events-events_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventlist.svg
-    image_alt: ''
-  -
-    block_id: 'views_block:uw_view_news_items-news_items_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newslist.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_multi_type_list
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/multitypelist.svg
-    image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_teasers.yml

@@ -4,19 +4,3 @@ dependencies: {  }
 id: uw_bc_teasers
 label: Teasers
 weight: null
-blocks:
-  -
-    block_id: uw_cbl_blog_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/blogteaser.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_news_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newsteaser.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_event_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventteaser.svg
-    image_alt: ''

config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_webforms.yml

@@ -4,9 +4,3 @@ dependencies: {  }
 id: uw_bc_webforms
 label: Webforms
 weight: null
-blocks:
-  -
-    block_id: webform_block
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/webform.svg
-    image_alt: ''

config/install/layout_builder_styles.style.uw_lbs_carousel_1_item.yml

@@ -5,6 +5,6 @@ id: uw_lbs_carousel_1_item
 label: 'Carousel - 1 item'
 classes: uw-carousel--one-item
 type: component
-weight: 0
+weight: -10
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'

config/install/layout_builder_styles.style.uw_lbs_carousel_2_items.yml

@@ -5,6 +5,6 @@ id: uw_lbs_carousel_2_items
 label: 'Carousel - 2 items'
 classes: uw-carousel--two-items
 type: component
-weight: 0
+weight: -9
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'

config/install/layout_builder_styles.style.uw_lbs_carousel_3_items.yml

@@ -5,6 +5,6 @@ id: uw_lbs_carousel_3_items
 label: 'Carousel - 3 items'
 classes: uw-carousel--three-items
 type: component
-weight: 0
+weight: -8
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'

config/install/layout_builder_styles.style.uw_lbs_carousel_4_items.yml

@@ -5,6 +5,6 @@ id: uw_lbs_carousel_4_items
 label: 'Carousel - 4 items'
 classes: uw-carousel--four-items
 type: component
-weight: 0
+weight: -7
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'

config/install/layout_builder_styles.style.uw_lbs_contained_width.yml

@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies: {  }
 id: uw_lbs_contained_width
-label: 'Contained width'
+label: 'Extra-wide contained width'
 classes: uw-contained-width
 type: section
-weight: 0
+weight: -4
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'

config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml

+langcode: en
+status: true
+dependencies: {  }
+id: uw_lbs_contained_width_narrow
+label: 'Narrow contained width'
+classes: "uw-contained-width\r\nuw-contained-width--narrow"
+type: section
+weight: -6
+block_restrictions: {  }

config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml

+langcode: en
+status: true
+dependencies: {  }
+id: uw_lbs_contained_width_wide
+label: 'Wide contained width'
+classes: "uw-contained-width\r\nuw-contained-width--wide"
+type: section
+weight: -5
+block_restrictions: {  }

config/install/layout_builder_styles.style.uw_lbs_full_width.yml

@@ -5,7 +5,7 @@ id: uw_lbs_full_width
 label: 'Full width'
 classes: uw-full-width
 type: section
-weight: 0
+weight: -3
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'

config/install/user.role.uw_role_site_owner.yml

@@ -17,6 +17,7 @@ permissions:
   - 'administer main menu items'
   - 'administer role expire'
   - 'administer shortcuts'
+  - 'administer users'
   - 'administer uw-menu-audience-menu menu items'
   - 'can override my_dashboard dashboard'
   - 'can view my_dashboard dashboard'

uw_cfg_common.info.yml

@@ -3,11 +3,13 @@ description: 'Configuration for all common WCMS'
 type: module
 core_version_requirement: '^8.7.7 || ^9'
 dependencies:
+  - block_content
   - block_list_override
   - captcha
   - ckeditor
   - config_views
   - core_event_dispatcher
+  - ctools
   - editor
   - features
   - field
@@ -28,5 +30,7 @@ dependencies:
   - pathauto
   - preprocess_event_dispatcher
   - taxonomy
+  - text
   - user
   - views
+

uw_cfg_common.links.menu.yml

@@ -41,7 +41,7 @@ uw_global_footer.accessibility:
   weight: 2
 
 uw_global_footer.media:
-  title: 'Media'
+  title: 'News'
   menu_name: uw-menu-global-footer
   url: https://uwaterloo.ca/news/
   weight: 3
@@ -116,313 +116,181 @@ uw_content_management.content_types:
   title: 'Content types'
   menu_name: uw-menu-content-management
   route_name: entity.node_type.collection
-  weight: 10
+  weight: 0
 
 uw_content_management.content_types.blog_post:
   title: 'Blog post'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_blog
-  weight: 10
+  weight: 0
+
+uw_content_management.content_types.catalog_item.add_blog_tag:
+  title: 'Add blog tag'
+  parent: uw_content_management.content_types.blog_post
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_blog_tags/add
+  weight: 0
 
-uw_content_management.content_types.blog_post.blog_settings:
-  title: 'Blog page settings'
+uw_content_management.content_types.catalog_item.list_blog_tag:
+  title: 'List blog tags'
   parent: uw_content_management.content_types.blog_post
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_blog_tags/overview
+  weight: 0
 
 uw_content_management.content_types.catalog_item:
   title: 'Catalog item'
   parent: uw_content_management.content_types
-  url: internal:/node/add
-  weight: 10
-
-uw_content_management.content_types.catalog_item.catalog_settings:
-  title: 'Catalog settings'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 10
+  url: internal:/node/add/uw_ct_catalog_item
+  weight: 0
 
 uw_content_management.content_types.catalog_item.add_catalog:
   title: 'Add catalog'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 20
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalogs/add
+  weight: 0
 
 uw_content_management.content_types.catalog_item.list_catalogs:
   title: 'List catalogs'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 30
-
-uw_content_management.content_types.catalog_item.merge_catalogs:
-  title: 'Merge catalogs'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 40
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalogs/overview
+  weight: 0
 
 uw_content_management.content_types.catalog_item.add_catalog_category:
   title: 'Add catalog category'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 50
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalog_categories/add
+  weight: 0
 
 uw_content_management.content_types.catalog_item.list_catalog_categories:
   title: 'List catalog categories'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 60
-
-uw_content_management.content_types.catalog_item.merge_catalog_categories:
-  title: 'Merge catalog categories'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 70
-
-uw_content_management.content_types.contact:
-  title: 'Contact'
-  parent: uw_content_management.content_types
-  url: internal:/node/add
-  weight: 20
-
-uw_content_management.content_types.contact.rearrange_contacts:
-  title: 'Rearrange contacts'
-  parent: uw_content_management.content_types.contact
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalog_categories/overview
+  weight: 0
 
 uw_content_management.content_types.event:
   title: 'Event'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_event
-  weight: 30
+  weight: 0
+
+uw_content_management.content_types.event.add_event_tag:
+  title: 'Add event tag'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_tags/add
+  weight: 0
+
+uw_content_management.content_types.event.list_event_tags:
+  title: 'List event tags'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_tags/overview
+  weight: 0
+
+uw_content_management.content_types.event.add_event_type:
+  title: 'Add event type'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_type/add
+  weight: 0
+
+uw_content_management.content_types.event.list_event_types:
+  title: 'List event types'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_type/overview
+  weight: 0
 
 uw_content_management.content_types.news_item:
   title: 'News item'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_news_item
-  weight: 40
+  weight: 0
+
+uw_content_management.content_types.news_item.add_news_tag:
+  title: 'Add news tag'
+  parent: uw_content_management.content_types.news_item
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_news_tags/add
+  weight: 0
+
+uw_content_management.content_types.news_item.list_news_tags:
+  title: 'List news tags'
+  parent: uw_content_management.content_types.news_item
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_news_tags/overview
+  weight: 0
 
 uw_content_management.content_types.site_footer:
   title: 'Site footer'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_site_footer
-  weight: 30
+  weight: 0
 
 uw_content_management.content_types.web_page:
   title: 'Web page'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_web_page
-  weight: 40
+  weight: 0
 
 uw_content_management.forms:
   title: 'Forms'
   menu_name: uw-menu-content-management
   url: internal:/admin/structure/webform
-  weight: 50
+  weight: 0
 
 uw_content_management.forms.form:
   title: 'Form'
   parent: uw_content_management.forms
   url: internal:/admin/structure/webform/add
-  weight: 10
+  weight: 0
 
 uw_content_management.forms.form.manage_submissions:
   title: 'Manage submissions'
   parent: uw_content_management.forms.form
   url: internal:/admin/structure/webform/submissions/manage
-  weight: 10
-
-uw_content_management.reusable_content:
-  title: 'Reusable content'
-  menu_name: uw-menu-content-management
-  route_name: entity.node_type.collection
-  weight: 40
-
-uw_content_management.reusable_content.blockquote:
-  title: 'Blockquote'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_blockquote
-  weight: 10
-
-uw_content_management.reusable_content.call_to_action:
-  title: 'Call to action'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_call_to_action
-  weight: 15
-
-uw_content_management.reusable_content.copy_text:
-  title: 'Copy text'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_copy_text
-  weight: 20
-
-uw_content_management.reusable_content.expand_collapse:
-  title: 'Expand / Collapse'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_expand_collapse
-  weight: 25
-
-uw_content_management.reusable_content.facebook:
-  title: 'Facebook'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_facebook
-  weight: 30
-
-uw_content_management.reusable_content.facts_and_figures:
-  title: 'Facts and figures'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_facts_and_figures
-  weight: 35
-
-uw_content_management.reusable_content.image:
-  title: 'Full width image'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_image
-  weight: 40
-
-uw_content_management.reusable_content.instagram:
-  title: 'Instagram'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_instagram
-  weight: 45
-
-uw_content_management.reusable_content.mailmain:
-  title: 'Mailman subscription'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_mailman
-  weight: 50
-
-uw_content_management.reusable_content.remove_video:
-  title: 'Remote video'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_remote_video
-  weight: 55
-
-uw_content_management.reusable_content.tableau:
-  title: 'Tableau visualization'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_tableau
-  weight: 60
-
-uw_content_management.reusable_content.twitter:
-  title: 'Twitter'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_twitter
-  weight: 65
+  weight: 0
 
 uw_content_management.global_vocabularies:
   title: 'Global vocabularies'
   menu_name: uw-menu-content-management
-  route_name: entity.node_type.collection
-  weight: 50
+  url: internal:/admin/structure/taxonomy
+  weight: 0
 
 uw_content_management.global_vocabularies.audience:
   title: 'Audience'
   parent: uw_content_management.global_vocabularies
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience
+  weight: 0
 
-uw_content_management.global_vocabularies.audience.list_terms:
-  title: 'List terms'
+uw_content_management.global_vocabularies.audience.add_term:
+  title: 'Add term'
   parent: uw_content_management.global_vocabularies.audience
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience/add
+  weight: 0
 
-uw_content_management.global_vocabularies.audience.merge_terms:
-  title: 'Merge terms'
+uw_content_management.global_vocabularies.audience.list_terms:
+  title: 'List terms'
   parent: uw_content_management.global_vocabularies.audience
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience/overview
+  weight: 0
 
-uw_site_management.google_universal_analytics:
-  title: 'Google Universal Analytics'
+uw_site_management.content_access:
+  title: 'Content access'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 5
-
-uw_site_management.home_page_banner_settings:
-  title: 'Home page banner settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/content-access
+  weight: 0
 
 uw_site_management.menus:
   title: 'Menus'
   menu_name: uw-menu-site-management
   route_name: entity.menu.collection
-  weight: 15
-
-uw_site_management.microsoft_teams_options:
-  title: 'Microsoft Teams options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 20
-
-uw_site_management.open_authentication:
-  title: 'Open authentication'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 25
-
-uw_site_management.path_review_report:
-  title: 'Path review report'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 30
-
-uw_site_management.project_settings:
-  title: 'Project settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 35
-
-uw_site_management.redirects:
-  title: 'Redirects'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 40
-
-uw_site_management.service_ist_settings:
-  title: 'Service IST settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 45
-
-uw_site_management.service_settings:
-  title: 'Service settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 50
-
-uw_site_management.shortcuts:
-  title: 'Shortcuts'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 55
-
-uw_site_management.slack_options:
-  title: 'Slack options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 60
-
-uw_site_management.slack_mattermost_options:
-  title: 'Slack/Mattermost options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 65
+  weight: 0
 
 uw_site_management.submit_request:
   title: 'Submit request'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 70
+  url: mailto:rt-ist-wcms@rt.uwaterloo.ca
+  weight: 0
 
 uw_site_management.wcms_how_to_documents:
   title: 'WCMS how-to documents'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 75
+  url: https://uwaterloo.ca/web-resources/wcms-users/training-and-support/wcms-how-documents
+  weight: 0
 
 uw_main_menu.blog:
   title: 'Blog'