Skip to content

WT-334 - Build CMS Components For Advertising Pages - Part 3 - #16815

Merged
dchukhin merged 240 commits into
mainfrom
WT-334-cms-components-for-advertising-sub-navigation
Nov 24, 2025
Merged

WT-334 - Build CMS Components For Advertising Pages - Part 3#16815
dchukhin merged 240 commits into
mainfrom
WT-334-cms-components-for-advertising-sub-navigation

Conversation

@dchukhin

@dchukhin dchukhin commented Oct 17, 2025

Copy link
Copy Markdown
Collaborator

If this changeset needs to go into the FXC codebase, please add the WMO and FXC label.

This pull request depends on #16814, which should be reviewed first

One-line summary

This pull request makes the advertising sub-navigation editable through Wagtail.

Significant changes and points to review

Following the work in #16814, this pull request adds

  • a NavigationLinkBlock with the fields necessary for navigation links (types of links are: 1. a block on the Advertising index page, 2. an internal page, 3. an external link)
  • a sub_navigation streamfield to AdvertisingIndexPage, so users can create multiple items in the sub-navigation
  • validation for the AdvertisingIndexPage, verifying that subnavigation items are valid (can't choose a non-existent block, can't remove a block that's being used as a link, etc.)
  • updates templates, so that all children of the Advertising index page inherit the same sub-navigation

Also, the following changes from #16848 have been merged into this branch:

  • the ContentSubpage as a child of AdvertisingIndexPage
  • a few more blocks that support creating the 'Solutions' and 'Impact' pages:
    • StatisticCalloutBlock and StatisticBlock
    • FeatureListWithModalsBlock, FeatureItemWithModalBlock, and FigureBlock

Also, the following changes from #16860 have been merged into this branch:

  • the structure of AdvertisingIndexPage and ContentSubpage now more closely match the pattern used on springfield by nesting the existing content data inside of a sections field:
    • a sections field is a streamfield of SectionBlocks
    • each SectionBlock has a content streamblock that can have any of the blocks previously in the AdvertisingIndexPage and ContentSubpage content field
    • each SectionBlock also has a collapsed settings, which can set the section id, whether the section should have a divider on top (moved here from the nested blocks), and whether the section should have a dark background (moved here from the nested blocks)

Issue / Bugzilla link

WT-334

Testing

To test locally, go to Wagtail and create/edit an "Advertising index page" page in the page tree, and create a sub-navigation in the "Settings" panel. Try to make the sub-navigation identical to what is on http://localhost:8000/en-US/advertising/. Also, verify that the same sub-navigation exists on all children of the Advertising index page.

lucianoratamero and others added 30 commits October 7, 2025 01:19
@kkellydesign
kkellydesign requested review from janbrasna and stevejalim and removed request for janbrasna November 23, 2025 20:46
Comment thread bedrock/mozorg/views.py Outdated


@require_safe
def contact(request):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This page still appears to be inert in terms of handling form submissions

Comment thread bedrock/mozorg/models.py Outdated
FieldPanel("linkedin_link", heading="Linkedin Link"),
FieldPanel("tiktok_link", heading="Tiktok Link"),
FieldPanel("spotify_link", heading="Spotify Link"),
FieldPanel("twitter_link", heading="Twitter Link"),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per prev comment about Twitter links in general, plus naming of the site

Comment thread bedrock/mozorg/models.py Outdated
max_length=255,
blank=True,
)
twitter_link = models.URLField(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned in an earlier PR, I'm not sure we use Twitter any more. Also if we do, it's no longer called by that name

kkellydesign and others added 18 commits November 24, 2025 11:17
Co-authored-by: Steve Jalim <stevejalim@mozilla.com>
…334-cms-components-for-advertising-sub-navigation
…334-cms-components-for-advertising-sub-navigation
…334-cms-components-for-advertising-sub-navigation
Base automatically changed from WT-334-cms-components-for-advertising-subpage to main November 24, 2025 21:17
@dchukhin
dchukhin merged commit 560df22 into main Nov 24, 2025
4 checks passed
@dchukhin
dchukhin deleted the WT-334-cms-components-for-advertising-sub-navigation branch November 24, 2025 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Frontend HTML, CSS, JS... client side stuff Needs Review Awaiting code review Wagtail Development related to our use of Wagtail CMS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants