From 7a1a139d32fe1cbabb93e23a0d6682f058a9761b Mon Sep 17 00:00:00 2001 From: Arthur Baghdasaryan <62405127+arthurbaghdas@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:26:12 +0400 Subject: [PATCH 1/3] DP-29649: Correct spelling issue in address error (#2187) * DP-29649: Correct spelling issue in address error * DP-29649: Correct spelling issue in address error --- changelogs/DP-29649.yml | 3 +++ docroot/modules/custom/mass_map/src/MapLocationFetcher.php | 2 +- .../mass_theme/templates/views/views-view--locations.html.twig | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/DP-29649.yml diff --git a/changelogs/DP-29649.yml b/changelogs/DP-29649.yml new file mode 100644 index 0000000000..e349968bf3 --- /dev/null +++ b/changelogs/DP-29649.yml @@ -0,0 +1,3 @@ +Fixed: + - description: Correct spelling issue in address error. + issue: DP-29649 diff --git a/docroot/modules/custom/mass_map/src/MapLocationFetcher.php b/docroot/modules/custom/mass_map/src/MapLocationFetcher.php index 52827b8cce..cd307227af 100644 --- a/docroot/modules/custom/mass_map/src/MapLocationFetcher.php +++ b/docroot/modules/custom/mass_map/src/MapLocationFetcher.php @@ -42,7 +42,7 @@ public function getLocations(array $nids) { 'name' => 'filter-by-location', 'type' => 'text', 'placeholder' => 'City, town, or ZIP code', - 'errorMsg' => 'Please select an address in the suggesions. Hit ENTER or start typing to show suggesions.' + 'errorMsg' => 'Please select an address in the suggestions. Hit ENTER or start typing to show suggestions.' ], ], 'tags' => [ diff --git a/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig b/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig index 5281dbb8ed..3a11a6c400 100644 --- a/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig +++ b/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig @@ -81,7 +81,7 @@
-
Please select an address in the suggesions. Hit ENTER or start typing to show suggesions.
+
Please select an address in the suggestions. Hit ENTER or start typing to show suggestions.
From e8d2812fc6280d4d50dd1d03184bed3d5c2ae038 Mon Sep 17 00:00:00 2001 From: CircleCI Deployment Bot Date: Tue, 12 Sep 2023 17:06:20 +0000 Subject: [PATCH 2/3] changelog update and remove old changelog files --- CHANGELOG.md | 20 +++++++++++++++++++ changelogs/DP-28608.yml | 41 -------------------------------------- changelogs/DP-29020.yml | 41 -------------------------------------- changelogs/DP-29416.yml | 41 -------------------------------------- changelogs/DP-29493.yml | 41 -------------------------------------- changelogs/DP-29536.yml | 41 -------------------------------------- changelogs/DP-29542.yml | 41 -------------------------------------- changelogs/DP-29553.yml | 41 -------------------------------------- changelogs/DP-29559.yml | 41 -------------------------------------- changelogs/DP-29600.yml | 41 -------------------------------------- changelogs/DP-29649.yml | 3 --- scripts/changelog-body.txt | 24 ++++++++++------------ 12 files changed, 31 insertions(+), 385 deletions(-) delete mode 100644 changelogs/DP-28608.yml delete mode 100644 changelogs/DP-29020.yml delete mode 100644 changelogs/DP-29416.yml delete mode 100644 changelogs/DP-29493.yml delete mode 100644 changelogs/DP-29536.yml delete mode 100644 changelogs/DP-29542.yml delete mode 100644 changelogs/DP-29553.yml delete mode 100644 changelogs/DP-29559.yml delete mode 100644 changelogs/DP-29600.yml delete mode 100644 changelogs/DP-29649.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index ea89c09bab..601ce33c9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ +## [0.373.0] - September 12, 2023 + +### Changed + - DP-28608: Replace superset data in views with data from bigquery + - DP-29020: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". + - DP-29416: Replace Twitter logo with new 'X' logo and add Threads logo + - DP-29553: Remove service details pages from visual regression testing in backstop. + - DP-29559: Role permissions changed to allow all authors and editors access to new analytics tab without tester role. Cleanup of tester role permissions. + +### Fixed + - DP-29493: Fix default domain URLs from service detail migration + - DP-29536: Fixed Tugboat builds. + - DP-29600: Fixed suggested page item link covering the whole page. + - DP-29649: Correct spelling issue in address error. + +### Added + - Avoid redirect to install.php when DB is down + + + ## [0.372.0] - September 5, 2023 ### Changed diff --git a/changelogs/DP-28608.yml b/changelogs/DP-28608.yml deleted file mode 100644 index 4956b2393f..0000000000 --- a/changelogs/DP-28608.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Replace superset data in views with data from bigquery - issue: DP-28608 diff --git a/changelogs/DP-29020.yml b/changelogs/DP-29020.yml deleted file mode 100644 index 9ff84d0a87..0000000000 --- a/changelogs/DP-29020.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". - issue: DP-29020 diff --git a/changelogs/DP-29416.yml b/changelogs/DP-29416.yml deleted file mode 100644 index e649f03a18..0000000000 --- a/changelogs/DP-29416.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Replace Twitter logo with new 'X' logo and add Threads logo - issue: DP-29416 diff --git a/changelogs/DP-29493.yml b/changelogs/DP-29493.yml deleted file mode 100644 index be127d5736..0000000000 --- a/changelogs/DP-29493.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fix default domain URLs from service detail migration - issue: DP-29493 diff --git a/changelogs/DP-29536.yml b/changelogs/DP-29536.yml deleted file mode 100644 index 671212c4e1..0000000000 --- a/changelogs/DP-29536.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fixed Tugboat builds. - issue: DP-29536 diff --git a/changelogs/DP-29542.yml b/changelogs/DP-29542.yml deleted file mode 100644 index 93da16f1d7..0000000000 --- a/changelogs/DP-29542.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Added: - - description: Avoid redirect to install.php when DB is down - issue: diff --git a/changelogs/DP-29553.yml b/changelogs/DP-29553.yml deleted file mode 100644 index 8f887c87af..0000000000 --- a/changelogs/DP-29553.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Remove service details pages from visual regression testing in backstop. - issue: DP-29553 diff --git a/changelogs/DP-29559.yml b/changelogs/DP-29559.yml deleted file mode 100644 index e974a28186..0000000000 --- a/changelogs/DP-29559.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Role permissions changed to allow all authors and editors access to new analytics tab without tester role. Cleanup of tester role permissions. - issue: DP-29559 diff --git a/changelogs/DP-29600.yml b/changelogs/DP-29600.yml deleted file mode 100644 index 8b6bce59da..0000000000 --- a/changelogs/DP-29600.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fixed suggested page item link covering the whole page. - issue: DP-29600 diff --git a/changelogs/DP-29649.yml b/changelogs/DP-29649.yml deleted file mode 100644 index e349968bf3..0000000000 --- a/changelogs/DP-29649.yml +++ /dev/null @@ -1,3 +0,0 @@ -Fixed: - - description: Correct spelling issue in address error. - issue: DP-29649 diff --git a/scripts/changelog-body.txt b/scripts/changelog-body.txt index 7effa5b02f..b87aa53671 100644 --- a/scripts/changelog-body.txt +++ b/scripts/changelog-body.txt @@ -1,22 +1,20 @@ -## [0.372.0] - September 5, 2023 +## [0.373.0] - September 12, 2023 ### Changed - - DP-25149: Revert Akamai version which got moved up recently. Fixes test failures. - - DP-28733: Remove aria-labelledby from key actions, title attribute from its comp heading and correct the heading level. - - DP-288257: Consolidate two Drush commands into one - ma:heal-references-to-trash - - DP-28842: Drupal 10 compat - Update Entity Embed and LinkIt - - DP-29492: Config change to load Google Tag manager in all paths including author paths. - -### Removed - - DP-26154: Remove testing of service_details pages + - DP-28608: Replace superset data in views with data from bigquery + - DP-29020: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". + - DP-29416: Replace Twitter logo with new 'X' logo and add Threads logo + - DP-29553: Remove service details pages from visual regression testing in backstop. + - DP-29559: Role permissions changed to allow all authors and editors access to new analytics tab without tester role. Cleanup of tester role permissions. ### Fixed - - DP-28622: Export report of orphaned pages fixed. - - DP-29391: Fix flagging for migrated service details pages. + - DP-29493: Fix default domain URLs from service detail migration + - DP-29536: Fixed Tugboat builds. + - DP-29600: Fixed suggested page item link covering the whole page. + - DP-29649: Correct spelling issue in address error. ### Added - - DP-29259: Add metadata field mg_parent_org. - - DP-29392: Add drush ma:backup command for starting an on-demand DB backup. + - Avoid redirect to install.php when DB is down From 1238f6a0839ac941ebda25d6d2c4c6c477dcc11e Mon Sep 17 00:00:00 2001 From: Tom Fleming Date: Tue, 12 Sep 2023 14:29:20 -0400 Subject: [PATCH 3/3] Revert "feature/DP-29020_convert_wwyltd_to_flexible_links" --- changelogs/DP-29020.yml | 41 --- ...aragraph.org_section_long_form.default.yml | 11 +- ...aragraph.org_section_long_form.default.yml | 9 - ...g_form.field_section_long_form_content.yml | 27 +- ..._section_long_form.field_section_style.yml | 23 -- .../mass_content/mass_content.deploy.php | 273 ------------------ .../custom/mass_fields/mass_fields.module | 152 +++++----- .../migrate/source/UpdateReferences.php | 3 +- .../mass_theme/mass_theme.libraries.yml | 2 +- .../themes/custom/mass_theme/mass_theme.theme | 38 +-- .../css/{sections.css => service-section.css} | 21 +- ...--org-section-long-form--default.html.twig | 102 +++---- 12 files changed, 129 insertions(+), 573 deletions(-) delete mode 100644 changelogs/DP-29020.yml delete mode 100644 conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_style.yml rename docroot/themes/custom/mass_theme/overrides/css/{sections.css => service-section.css} (63%) diff --git a/changelogs/DP-29020.yml b/changelogs/DP-29020.yml deleted file mode 100644 index 9ff84d0a87..0000000000 --- a/changelogs/DP-29020.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". - issue: DP-29020 diff --git a/conf/drupal/config/core.entity_form_display.paragraph.org_section_long_form.default.yml b/conf/drupal/config/core.entity_form_display.paragraph.org_section_long_form.default.yml index 733fab7fb0..7973083e55 100644 --- a/conf/drupal/config/core.entity_form_display.paragraph.org_section_long_form.default.yml +++ b/conf/drupal/config/core.entity_form_display.paragraph.org_section_long_form.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.paragraph.org_section_long_form.field_hide_heading - field.field.paragraph.org_section_long_form.field_section_long_form_content - field.field.paragraph.org_section_long_form.field_section_long_form_heading - - field.field.paragraph.org_section_long_form.field_section_style - paragraphs.paragraphs_type.org_section_long_form module: - field_group @@ -19,7 +18,7 @@ third_party_settings: label: 'Section Content' region: content parent_name: '' - weight: 3 + weight: 2 format_type: details format_settings: classes: section-content @@ -32,7 +31,7 @@ third_party_settings: label: 'Additional Resources' region: content parent_name: '' - weight: 4 + weight: 3 format_type: details format_settings: classes: '' @@ -72,12 +71,6 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_section_style: - type: options_buttons - weight: 2 - region: content - settings: { } - third_party_settings: { } hidden: created: true status: true diff --git a/conf/drupal/config/core.entity_view_display.paragraph.org_section_long_form.default.yml b/conf/drupal/config/core.entity_view_display.paragraph.org_section_long_form.default.yml index 821020cd53..83d853a4bd 100644 --- a/conf/drupal/config/core.entity_view_display.paragraph.org_section_long_form.default.yml +++ b/conf/drupal/config/core.entity_view_display.paragraph.org_section_long_form.default.yml @@ -6,11 +6,9 @@ dependencies: - field.field.paragraph.org_section_long_form.field_hide_heading - field.field.paragraph.org_section_long_form.field_section_long_form_content - field.field.paragraph.org_section_long_form.field_section_long_form_heading - - field.field.paragraph.org_section_long_form.field_section_style - paragraphs.paragraphs_type.org_section_long_form module: - entity_reference_revisions - - options id: paragraph.org_section_long_form.default targetEntityType: paragraph bundle: org_section_long_form @@ -33,13 +31,6 @@ content: third_party_settings: { } weight: 0 region: content - field_section_style: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 2 - region: content hidden: computed_org_page: true field_hide_heading: true diff --git a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml b/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml index cd72bdb98b..58333a249f 100644 --- a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml +++ b/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml @@ -11,7 +11,6 @@ dependencies: - paragraphs.paragraphs_type.featured_item_mosaic - paragraphs.paragraphs_type.featured_message - paragraphs.paragraphs_type.featured_topics - - paragraphs.paragraphs_type.flexible_link_group - paragraphs.paragraphs_type.iframe - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.info_details_card_group @@ -29,6 +28,7 @@ dependencies: - paragraphs.paragraphs_type.stat - paragraphs.paragraphs_type.tableau_embed - paragraphs.paragraphs_type.video + - paragraphs.paragraphs_type.what_would_you_like_to_do module: - entity_reference_revisions id: paragraph.org_section_long_form.field_section_long_form_content @@ -67,8 +67,8 @@ settings: stat: stat tableau_embed: tableau_embed video: video + what_would_you_like_to_do: what_would_you_like_to_do collection_search: collection_search - flexible_link_group: flexible_link_group negate: 0 target_bundles_drag_drop: 1up_stacked_band: @@ -125,9 +125,6 @@ settings: advisory_section: weight: 39 enabled: false - alert: - weight: 151 - enabled: false board_member: weight: 40 enabled: false @@ -164,9 +161,6 @@ settings: contact_info: weight: 48 enabled: false - contact_placeholder: - weight: 164 - enabled: false content_card_group: weight: 49 enabled: false @@ -221,9 +215,6 @@ settings: file_download_single: weight: 63 enabled: false - flexible_link_group: - weight: 183 - enabled: true footnotes: weight: 64 enabled: false @@ -272,6 +263,9 @@ settings: key_message_section: weight: 76 enabled: false + link_group: + weight: 77 + enabled: false link_group_accordion: weight: 90 enabled: false @@ -419,12 +413,6 @@ settings: section_with_heading: weight: 117 enabled: false - service_rich_text: - weight: 249 - enabled: false - service_section: - weight: 250 - enabled: false sitewide_alert_message: weight: 242 enabled: false @@ -452,9 +440,6 @@ settings: tableau_embed: weight: 20 enabled: true - time_callout: - weight: 260 - enabled: false video: weight: 21 enabled: true @@ -466,5 +451,5 @@ settings: enabled: false what_would_you_like_to_do: weight: 22 - enabled: false + enabled: true field_type: entity_reference_revisions diff --git a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_style.yml b/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_style.yml deleted file mode 100644 index 7d5256977b..0000000000 --- a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_style.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 17054d01-bdd8-4160-855d-f062c3f094e8 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_section_style - - paragraphs.paragraphs_type.org_section_long_form - module: - - options -id: paragraph.org_section_long_form.field_section_style -field_name: field_section_style -entity_type: paragraph -bundle: org_section_long_form -label: 'Section style' -description: 'The "Simple" option uses a plain black header with content on a white background. If you really want to call attention to this section, you can use the "Enhanced" option which will use a blue header banner and gray shading for the section.' -required: true -translatable: true -default_value: - - - value: simple -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/docroot/modules/custom/mass_content/mass_content.deploy.php b/docroot/modules/custom/mass_content/mass_content.deploy.php index c011cb2dbd..87ca71e637 100644 --- a/docroot/modules/custom/mass_content/mass_content.deploy.php +++ b/docroot/modules/custom/mass_content/mass_content.deploy.php @@ -9,8 +9,6 @@ use Drupal\Core\Datetime\DrupalDateTime; use Drupal\Core\Link; use Drupal\Core\Url; -use Drupal\mayflower\Helper; -use Drupal\node\Entity\Node; use Drupal\paragraphs\Entity\Paragraph; use Drupal\taxonomy\Entity\Term; @@ -899,274 +897,3 @@ function mass_content_deploy_related_content(&$sandbox) { } return "Processed {$sandbox['progress']} items."; } - -/** - * Set "Section style" default value for the org sections. - */ -function mass_content_deploy_org_section_style(&$sandbox) { - $_ENV['MASS_FLAGGING_BYPASS'] = TRUE; - - $query = \Drupal::entityQuery('paragraph')->accessCheck(FALSE); - $query->condition('type', 'org_section_long_form'); - - if (empty($sandbox)) { - // Get a list of all nodes of type event. - $sandbox['progress'] = 0; - $sandbox['current'] = 0; - $count = clone $query; - $sandbox['max'] = $count->count()->accessCheck(FALSE)->execute(); - } - - $batch_size = 50; - - $pids = $query->condition('id', $sandbox['current'], '>') - ->sort('id') - ->range(0, $batch_size) - ->execute(); - - $storage = \Drupal::entityTypeManager()->getStorage('paragraph'); - - $paragraphs = $storage->loadMultiple($pids); - - foreach ($paragraphs as $paragraph) { - $sandbox['current'] = $paragraph->id(); - if (!Helper::isParagraphOrphan($paragraph)) { - $paragraph->set('field_section_style', 'simple'); - $paragraph->save(); - } - $sandbox['progress']++; - } - - $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']); - if ($sandbox['#finished'] >= 1) { - return t('Section style default value set for the org sections. Processed @total items.', ['@total' => $sandbox['progress']]); - } - return "Processed {$sandbox['progress']} items."; -} - -/** - * Migrate "What would you like to do" to be flexible links. - */ -function mass_content_deploy_org_wwyltd_flexible_links(&$sandbox) { - $_ENV['MASS_FLAGGING_BYPASS'] = TRUE; - - $query = \Drupal::entityQuery('paragraph')->accessCheck(FALSE); - $query->condition('type', 'what_would_you_like_to_do'); - - if (empty($sandbox)) { - // Get a list of all nodes of type event. - $sandbox['progress'] = 0; - $sandbox['current'] = 0; - $count = clone $query; - $sandbox['max'] = $count->count()->accessCheck(FALSE)->execute(); - } - - $batch_size = 50; - - $pids = $query->condition('id', $sandbox['current'], '>') - ->sort('id') - ->range(0, $batch_size) - ->execute(); - - $storage = \Drupal::entityTypeManager()->getStorage('paragraph'); - - // Turn off entity_hierarchy writes while processing the item. - \Drupal::state()->set('entity_hierarchy_disable_writes', TRUE); - - $memory_cache = \Drupal::service('entity.memory_cache'); - - $paragraphs = $storage->loadMultiple($pids); - foreach ($paragraphs as $paragraph) { - $sandbox['current'] = $paragraph->id(); - if ($paragraph instanceof Paragraph) { - if (!Helper::isParagraphOrphan($paragraph)) { - if ($parent = $paragraph->getParentEntity()) { - if ($parent instanceof Paragraph && $parent->bundle() == 'org_section_long_form') { - if ($parent->getParentEntity() instanceof Node) { - $node = $parent->getParentEntity(); - try { - mass_content_org_wwyltd_flexible_links_helper($node, $parent, $paragraph); - } - catch (\Exception $e) { - \Drupal::state()->set('entity_hierarchy_disable_writes', FALSE); - } - if (!$node->isLatestRevision()) { - $storage = \Drupal::entityTypeManager()->getStorage('node'); - $query = $storage->getQuery()->accessCheck(FALSE); - $query->condition('nid', $node->id()); - $query->latestRevision(); - $rids = $query->execute(); - foreach ($rids as $rid) { - $latest_revision = $storage->loadRevision($rid); - if (isset($latest_revision)) { - try { - mass_content_org_wwyltd_flexible_links_helper($latest_revision, $parent, $paragraph); - } - catch (\Exception $e) { - \Drupal::state() - ->set('entity_hierarchy_disable_writes', FALSE); - } - } - } - } - } - } - } - } - } - $sandbox['progress']++; - } - - $memory_cache->deleteAll(); - - $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']); - if ($sandbox['#finished'] >= 1) { - \Drupal::state()->set('entity_hierarchy_disable_writes', FALSE); - return t('Migrate "What would you like to do" to flexible links. Processed @total items.', ['@total' => $sandbox['progress']]); - } - return "Processed {$sandbox['progress']} items."; -} - -/** - * Helper function to call during migration. - */ -function mass_content_org_wwyltd_flexible_links_helper($node, $parent, $paragraph) { - $node_field_name = $parent->parent_field_name->value; - $parent_field_name = $paragraph->parent_field_name->value; - if ($parent = $paragraph->getParentEntity()) { - $content_items = $parent->get($parent_field_name)->getValue(); - if ($parent->get($parent_field_name)->count() > 1) { - foreach ($content_items as $i => $content_item) { - if ($content_item['target_id'] == $paragraph->id() && $content_item['target_revision_id'] == $paragraph->getRevisionId()) { - $content_index = $i; - break; - } - } - } - } - - $items = $node->get($node_field_name)->getValue(); - foreach ($items as $index => $item) { - if ($item['target_id'] == $parent->id() && $item['target_revision_id'] == $parent->getRevisionId()) { - $section_index = $index; - break; - } - } - - $flexible_link_groups = []; - if (!$paragraph->get('field_wwyltd_top_s_links')->isEmpty()) { - $top_links = $paragraph->get('field_wwyltd_top_s_links') - ->getValue(); - - $link_group_links = []; - foreach ($top_links as $link) { - // Create a new link_group_link paragraph. - $link_group_link = Paragraph::create([ - 'type' => 'link_group_link', - ]); - - $link_group_link->set('field_link_group_link', $link); - $link_group_link->save(); - $link_group_links[] = $link_group_link; - } - - // Create a new flexible_link_group paragraph. - $flexible_link_group = Paragraph::create([ - 'type' => 'flexible_link_group', - ]); - - $flexible_link_group->set('field_featured', 1); - $flexible_link_group->set('field_display_type', 'buttons'); - // 2 = Buttons. - $flexible_link_group->set('field_link_group', $link_group_links); - $flexible_link_group->save(); - $flexible_link_groups[] = $flexible_link_group; - } - - if (!$paragraph->get('field_wwyltd_more_services')->isEmpty()) { - $more_paragraphs = $paragraph->get('field_wwyltd_more_services') - ->referencedEntities(); - - foreach ($more_paragraphs as $more_paragraph) { - if (!$more_paragraph->get('field_links_documents')->isEmpty()) { - $link_group_links = $more_paragraph->get('field_links_documents') - ->referencedEntities(); - - // Create a new flexible_link_group paragraph. - $flexible_link_group = Paragraph::create([ - 'type' => 'flexible_link_group', - ]); - - $flexible_link_group->set('field_featured', 0); - $flexible_link_group->set('field_display_type', 'links'); - $flexible_link_group->set('field_group_expanded', $more_paragraph->get('field_group_expanded')->value); - if (!$more_paragraph->get('field_group_expanded')->isEmpty()) { - $flexible_link_group->set('field_group_expanded', $more_paragraph->get('field_group_expanded')->value); - } - else { - $flexible_link_group->set('field_group_expanded', 1); - } - if (!$more_paragraph->get('field_section_title')->isEmpty()) { - $title = $more_paragraph->get('field_section_title')->value; - $flexible_link_group->set('field_flexible_link_group_title', $title); - } - $flexible_link_group->set('field_link_group', $link_group_links); - $flexible_link_group->save(); - $flexible_link_groups[] = $flexible_link_group; - } - } - } - - if ($flexible_link_groups) { - $new_org_section_long_form_paragraph = Paragraph::create([ - 'type' => 'org_section_long_form', - ]); - if (isset($content_index)) { - $result = []; - foreach ($content_items as $index => $content_item) { - if ($index == $content_index) { - foreach ($flexible_link_groups as $flexible_link_group) { - $result[] = $flexible_link_group; - } - } - else { - $result[] = $content_item; - } - } - $new_org_section_long_form_paragraph->set('field_section_long_form_content', $result); - } - else { - $new_org_section_long_form_paragraph->set('field_section_long_form_content', $flexible_link_groups); - } - if (!$paragraph->get('field_wwyltd_heading')->isEmpty()) { - $heading = $paragraph->get('field_wwyltd_heading')->value; - $new_org_section_long_form_paragraph->set('field_section_long_form_heading', $heading); - } - $new_org_section_long_form_paragraph->set('field_section_style', 'enhanced'); - $new_org_section_long_form_paragraph->set('field_hide_heading', 0); - - // Save the new paragraph. - $new_org_section_long_form_paragraph->save(); - // Create a value array for the new section paragraph. - $new_org_section_long_form_paragraph_value = [ - 'target_id' => $new_org_section_long_form_paragraph->id(), - 'target_revision_id' => $new_org_section_long_form_paragraph->getRevisionId(), - ]; - if (isset($section_index)) { - $items[$section_index] = $new_org_section_long_form_paragraph_value; - } - else { - $items[] = $new_org_section_long_form_paragraph_value; - } - - $node->set('field_organization_sections', $items); - // Save the node. - // Save without updating the last modified date. This requires a core patch - // from the issue: https://www.drupal.org/project/drupal/issues/2329253. - $node->setSyncing(TRUE); - $node->revision_log = "Bulk automated change of ‘what would you like to do’ component to ‘flexible link group’"; - $node->setRevisionCreationTime(\Drupal::time()->getCurrentTime()); - $node->save(); - $paragraph->delete(); - } -} diff --git a/docroot/modules/custom/mass_fields/mass_fields.module b/docroot/modules/custom/mass_fields/mass_fields.module index 8af8ea8951..0eb33eeedf 100644 --- a/docroot/modules/custom/mass_fields/mass_fields.module +++ b/docroot/modules/custom/mass_fields/mass_fields.module @@ -896,89 +896,87 @@ function _mass_fields_conditions_for_paragraphs(&$element, FormStateInterface $f $widget_state = WidgetBase::getWidgetState($element['#field_parents'], $paragraph_entity_reference_field_name, $form_state); /** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */ $paragraph_instance = $widget_state['paragraphs'][$element['#delta']]['entity']; - if ($paragraph_instance) { - $paragraph_type = $paragraph_instance->bundle(); - // Determine which paragraph type is being embedded. - switch ($paragraph_type) { - case 'collection_search': - $dependee_field_name = 'field_search_type'; - $selector = sprintf('select[name="%s[%d][subform][%s][%d][subform][%s]"]', - $element['#field_parents'][0], - $element['#field_parents'][1], + $paragraph_type = $paragraph_instance->bundle(); + // Determine which paragraph type is being embedded. + switch ($paragraph_type) { + case 'collection_search': + $dependee_field_name = 'field_search_type'; + $selector = sprintf('select[name="%s[%d][subform][%s][%d][subform][%s]"]', + $element['#field_parents'][0], + $element['#field_parents'][1], + $paragraph_entity_reference_field_name, + $element['#delta'], + $dependee_field_name); + + if ($paragraph_entity_reference_field_name == 'field_sections') { + $selector = sprintf('select[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); + } - if ($paragraph_entity_reference_field_name == 'field_sections') { - $selector = sprintf('select[name="%s[%d][subform][%s]"]', - $paragraph_entity_reference_field_name, - $element['#delta'], - $dependee_field_name); - } + // Dependent fields. + $element['subform']['field_collection']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'collection'], + ], + 'required' => [ + $selector => ['value' => 'collection'], + ], + ]; - // Dependent fields. - $element['subform']['field_collection']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'collection'], - ], - 'required' => [ - $selector => ['value' => 'collection'], - ], - ]; - - // Dependent fields. - $element['subform']['field_search_site_url']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'external'], - ], - 'required' => [ - $selector => ['value' => 'external'], - ], - ]; - - // Dependent fields. - $element['subform']['field_search_query_param_name']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'external'], - ], - 'required' => [ - $selector => ['value' => 'external'], - ], - ]; - break; - - case 'key_message_section': - $dependee_field_name = 'field_background_type'; - $selector = sprintf('input[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); - - // Dependent fields. - $element['subform']['field_image']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'image'], - ], - 'required' => [ - $selector => ['value' => 'image'], - ], - ]; - - $element['subform']['field_section_background_color']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'color'], - ], - 'required' => [ - $selector => ['value' => 'color'], - ], - ]; - - $element['subform']['field_section_text_overlay_color']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'image'], - ], - - ]; - break; + // Dependent fields. + $element['subform']['field_search_site_url']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'external'], + ], + 'required' => [ + $selector => ['value' => 'external'], + ], + ]; + + // Dependent fields. + $element['subform']['field_search_query_param_name']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'external'], + ], + 'required' => [ + $selector => ['value' => 'external'], + ], + ]; + break; + + case 'key_message_section': + $dependee_field_name = 'field_background_type'; + $selector = sprintf('input[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); + + // Dependent fields. + $element['subform']['field_image']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'image'], + ], + 'required' => [ + $selector => ['value' => 'image'], + ], + ]; + + $element['subform']['field_section_background_color']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'color'], + ], + 'required' => [ + $selector => ['value' => 'color'], + ], + ]; + + $element['subform']['field_section_text_overlay_color']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'image'], + ], + + ]; + break; - } } } } diff --git a/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php b/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php index 7e6673ee47..e4a8c2c45c 100644 --- a/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php +++ b/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php @@ -129,7 +129,8 @@ public function prepareRow(Row $row) { } break; case EntityReferenceItem::class: - if ($item->get('target_id')->getString() == $ref['reference_value_old']) { + if ($item->get('target_id') + ->getString() == $ref['reference_value_old']) { $values[$field_name][$delta]['target_id'] = $ref['reference_value_new']; $changed = TRUE; } diff --git a/docroot/themes/custom/mass_theme/mass_theme.libraries.yml b/docroot/themes/custom/mass_theme/mass_theme.libraries.yml index d057325f90..4e9b318ef0 100644 --- a/docroot/themes/custom/mass_theme/mass_theme.libraries.yml +++ b/docroot/themes/custom/mass_theme/mass_theme.libraries.yml @@ -21,7 +21,7 @@ global-styling: overrides/css/contained.css: {} overrides/css/campaign_landing.css: {} overrides/css/flexible-link-group.css: {} - overrides/css/sections.css: {} + overrides/css/service-section.css: {} overrides/css/news-page.css: {} overrides/css/language-bar.css: {} js: diff --git a/docroot/themes/custom/mass_theme/mass_theme.theme b/docroot/themes/custom/mass_theme/mass_theme.theme index 0254581653..700c1904be 100644 --- a/docroot/themes/custom/mass_theme/mass_theme.theme +++ b/docroot/themes/custom/mass_theme/mass_theme.theme @@ -7255,46 +7255,14 @@ function _mass_theme_preprocess_paragraph_sections(&$variables, $field) { * Groups different components together when necessary. */ function mass_theme_preprocess_paragraph__org_section_long_form(&$variables) { - - $container = $variables['paragraph']; - if (!$container->field_section_style->isEmpty()) { - $variables['section_style'] = $container->field_section_style->value; - } - $variables['hide_heading'] = $container->field_hide_heading->value; $variables["org_components"] = _mass_theme_preprocess_paragraph_sections($variables, 'field_section_long_form_content'); - $links_group = []; - foreach ($variables['org_components'] as $key => &$org_component) { - /** @var Drupal\paragraphs\Entity\Paragraph */ - $org_component_paragraph = &$org_component[0]; - if ( - is_object($org_component_paragraph) && - $org_component_paragraph->getType() == 'flexible_link_group' && - $org_component_paragraph->field_display_type->value == 'links' - ) { - $links_group[$key] = $org_component; - } - else { - _mass_theme_join_contiguous_flexible_link_group_type_links($links_group, $variables, 'org'); - $links_group = []; - } - } - - _mass_theme_join_contiguous_flexible_link_group_type_links($links_group, $variables, 'org'); - - // Removing elements included previously. - foreach ($variables['org_components'] as $key => &$org_component) { - if ($org_component === FALSE) { - unset($variables['org_components'][$key]); - } - } } /** * Join contiguous flexible link groups, type links, into the same element. */ -function _mass_theme_join_contiguous_flexible_link_group_type_links(&$links_group, &$variables, $destination = 'service') { - $component_name = $destination . '_components'; +function _mass_theme_join_contiguous_flexible_link_group_type_links(&$links_group, &$variables) { if (count($links_group) < 2) { return; } @@ -7304,10 +7272,10 @@ function _mass_theme_join_contiguous_flexible_link_group_type_links(&$links_grou continue; } - $variables[$component_name][$first][0]->subsequent_links[] = $link_group[0]; + $variables['service_components'][$first][0]->subsequent_links[] = $link_group[0]; // Empty elements included previously. - $variables[$component_name][$key] = FALSE; + $variables['service_components'][$key] = FALSE; } $links_group = []; } diff --git a/docroot/themes/custom/mass_theme/overrides/css/sections.css b/docroot/themes/custom/mass_theme/overrides/css/service-section.css similarity index 63% rename from docroot/themes/custom/mass_theme/overrides/css/sections.css rename to docroot/themes/custom/mass_theme/overrides/css/service-section.css index b52db0d1a8..75fcaa868a 100644 --- a/docroot/themes/custom/mass_theme/overrides/css/sections.css +++ b/docroot/themes/custom/mass_theme/overrides/css/service-section.css @@ -2,13 +2,11 @@ overflow: hidden; } -.org-section--enhanced, .service-section--enhanced { background-image: -o-linear-gradient(top, white 50px, #F2F2F2 51px); background: linear-gradient(180deg, white 50px, #F2F2F2 51px); } -.org-section--enhanced > section > header, .service-section--enhanced > section > header { margin-right: auto; margin-left: auto; @@ -21,23 +19,18 @@ font-size: 2rem; } -.org-section .ma__callout-links-three-up h3, .service-section .ma__callout-links-three-up h3 { margin-bottom: 0; } -.org-section .ma__callout-links-three-up p, .service-section .ma__callout-links-three-up p { margin-top: 0.5rem; } -.org-section .ma__callout-links-three-up__container, .service-section .ma__callout-links-three-up__container { margin-top: 2rem; } -.org-section--hidden-title > section > header, -.org-section--hidden-title > section > .ma__stacked-row__container, .service-section--hidden-title > section > header, .service-section--hidden-title > section > .ma__stacked-row__container { position: absolute; @@ -50,38 +43,32 @@ border: 0; } -.org-section--enhanced.org-section--hidden-title, .service-section--enhanced.service-section--hidden-title { background: #F2F2F2; padding-top: 40px; } -.org-section .ma__collapsible-content__body .ma__collapsible-content__body-item, -.service-section .ma__collapsible-content__body .ma__collapsible-content__body-item { +.service-section +.ma__collapsible-content__body +.ma__collapsible-content__body-item { margin: 0.5rem 0; display: block; } -.org-section--enhanced + .org-section--simple .ma__stacked-row__section .ma__stacked-row__container:before, .service-section--enhanced + .service-section--simple .ma__stacked-row__section .ma__stacked-row__container:before { border-color: transparent; } -.org-section .ma__stacked-row__container:before, .service-section .ma__stacked-row__container:before { border-color: transparent !important; } -.org-section--enhanced + .org-section--enhanced.org-section--hidden-title, .service-section--enhanced + .service-section--enhanced.service-section--hidden-title { margin-top: 0 !important; padding-top: 0 !important; } -.org-section.org-section--enhanced .ma__stacked-row__section .main-content { - padding-bottom: 30px; -} .service-section .ma__stacked-row__section .main-content { margin-bottom: 30px; -} +} \ No newline at end of file diff --git a/docroot/themes/custom/mass_theme/templates/paragraphs/paragraph--org-section-long-form--default.html.twig b/docroot/themes/custom/mass_theme/templates/paragraphs/paragraph--org-section-long-form--default.html.twig index 58af4b672a..f7a35d47a5 100644 --- a/docroot/themes/custom/mass_theme/templates/paragraphs/paragraph--org-section-long-form--default.html.twig +++ b/docroot/themes/custom/mass_theme/templates/paragraphs/paragraph--org-section-long-form--default.html.twig @@ -7,71 +7,41 @@ } %} {% endif %} -{% set section_style_class = section_style == 'enhanced' ? 'org-section--enhanced' : 'org-section--simple' %} -{% set hide_title_class = hide_heading ? 'org-section--hidden-title' : '' %} - -
- {% embed "@organisms/by-author/stacked-row-section.twig" with { - "stackedRowSection": heading, - "stackedRow": { - "borderless": true, - "modifier" : "no-sidebar" - }, - "externalSidebar": true - } %} - {% block stackRowTitle %} - {% if heading %} - {% if section_style == 'enhanced' %} - {% include "@atoms/04-headings/colored-heading-from-left.twig" with { - "coloredHeadingFromLeft": { - "bgColor": "green", - "title": (content.field_section_long_form_heading|field_value) - }} - %} - {% else %} -
-
- {% set compHeading = { - "title": stackedRowSection.title, - "sub": "", - "color": "", - "id": stackedRowSection.id - } - %} - {% include "@atoms/04-headings/comp-heading.twig" %} -
-
- {% endif %} +{% embed "@organisms/by-author/stacked-row-section.twig" with { + "stackedRowSection": heading, + "stackedRow": { + "borderless": true, + "modifier" : "no-sidebar" + }, + "externalSidebar": true +} %} + {% block stackedRowContentOverride %} + {% for org_component in org_components %} + {% if org_component.group == 'default' %} + {% embed "@organisms/by-author/rich-text.twig" %} + {% block rteElements %} + {% for c in org_component.items %} + {{ c|view }} + {% endfor %} + {% endblock %} + {% endembed %} + {% elseif org_component.group == 'self' %} + {% embed "@organisms/by-author/rich-text.twig" %} + {% block rteElements %} + {{ org_component.items|view }} + {% endblock %} + {% endembed %} + {% elseif org_component.group == 'contained' %} + {% embed "@organisms/by-author/rich-text.twig" with {'headerIndent' : 'om__contained-component'} %} + {% block rteElements %} + {{ org_component.items|view }} + {% endblock %} + {% endembed %} + {% else %} + {{ org_component[0]|view }} {% endif %} - {% endblock %} - {% block stackedRowContentOverride %} - {% for org_component in org_components %} - {% if org_component.group == 'default' %} - {% embed "@organisms/by-author/rich-text.twig" %} - {% block rteElements %} - {% for c in org_component.items %} - {{ c|view }} - {% endfor %} - {% endblock %} - {% endembed %} - {% elseif org_component.group == 'self' %} - {% embed "@organisms/by-author/rich-text.twig" %} - {% block rteElements %} - {{ org_component.items|view }} - {% endblock %} - {% endembed %} - {% elseif org_component.group == 'contained' %} - {% embed "@organisms/by-author/rich-text.twig" with {'headerIndent' : 'om__contained-component'} %} - {% block rteElements %} - {{ org_component.items|view }} - {% endblock %} - {% endembed %} - {% else %} - {{ org_component[0]|view }} - {% endif %} - {% endfor %} - {% endblock %} - {% endembed %} + {% endfor %} + {% endblock %} +{% endembed %} - {{ content.field_section_long_form_addition }} -
+{{ content.field_section_long_form_addition }}