Merge branch 'WT-962-set-as-default-page' of https://github.com/mozmeao/springfield into WT-962-set-as-default-page

kkellydesign · kkellydesign · commit fc9630684369 · 2026-04-01T17:55:49.000-04:00
diff --git a/springfield/cms/blocks.py b/springfield/cms/blocks.py
@@ -319,19 +319,20 @@
     ("other-os", "Other OS"),
     ("unsupported", "Unsupported OS"),
 ]
-
 FIREFOX_CHOICES = [
     ("", "No restriction"),
     ("is-firefox", "Firefox only"),
     ("not-firefox", "Non-Firefox only"),
 ]
-
 AUTH_CHOICES = [
     ("", "No restriction"),
     ("state-fxa-supported-signed-in", "Signed-in only"),
     ("state-fxa-supported-signed-out", "Signed-out only"),
 ]
-
+DEFAULT_BROWSER_CHOICES = [
+    ("is-default", "Firefox is default browser"),
+    ("is-not-default", "Firefox is not default browser"),
+]
 
 UITOUR_BUTTON_NEW_TAB = "open_new_tab"
 UITOUR_BUTTON_ABOUT_PREFERENCES = "open_about_preferences"
@@ -441,6 +442,13 @@ class ConditionalDisplayBlock(blocks.StructBlock):
         label="Login state",
         help_text="Filter by login state. Leave empty for no restriction.",
     )
+    default_browser = blocks.ChoiceBlock(
+        choices=DEFAULT_BROWSER_CHOICES,
+        default="",
+        required=False,
+        label="Default Browser",
+        help_text="Filter by default browser state. Leave empty for no restriction.",
+    )
 
     class Meta:
         label = "Conditional Display"
diff --git a/springfield/cms/fixtures/article_page_fixtures.py b/springfield/cms/fixtures/article_page_fixtures.py
@@ -17,7 +17,7 @@
     "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 )
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def create_article(
diff --git a/springfield/cms/fixtures/banner_fixtures.py b/springfield/cms/fixtures/banner_fixtures.py
@@ -8,7 +8,7 @@
 from springfield.cms.fixtures.video_fixtures import get_video_variants
 from springfield.cms.models import FreeFormPage, FreeFormPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_banner_variants():
diff --git a/springfield/cms/fixtures/card_fixtures.py b/springfield/cms/fixtures/card_fixtures.py
@@ -10,7 +10,7 @@
 from springfield.cms.fixtures.tag_fixtures import get_tag_variants
 from springfield.cms.models import FreeFormPage
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_sticker_card_variants() -> list[dict]:
diff --git a/springfield/cms/fixtures/cards_2026_fixtures.py b/springfield/cms/fixtures/cards_2026_fixtures.py
@@ -8,7 +8,7 @@
 from springfield.cms.fixtures.button_fixtures import get_button_variants
 from springfield.cms.models import FreeFormPage2026
 
-_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 _IMAGE_VARIANTS = {
     "image": settings.PLACEHOLDER_IMAGE_ID,
diff --git a/springfield/cms/fixtures/carousel_2026_fixtures.py b/springfield/cms/fixtures/carousel_2026_fixtures.py
@@ -8,7 +8,7 @@
 from springfield.cms.fixtures.button_fixtures import get_button_variants
 from springfield.cms.models import FreeFormPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def _image(image_id, dark_mode_image_id=None):
diff --git a/springfield/cms/fixtures/download_page_fixtures.py b/springfield/cms/fixtures/download_page_fixtures.py
@@ -9,7 +9,7 @@
 from springfield.cms.fixtures.snippet_fixtures import get_pre_footer_cta_form_snippet
 from springfield.cms.models import DownloadIndexPage, DownloadPage
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_illustration_cards():
diff --git a/springfield/cms/fixtures/freeformpage_2026.py b/springfield/cms/fixtures/freeformpage_2026.py
@@ -8,7 +8,7 @@
 from springfield.cms.fixtures.snippet_fixtures import get_qr_code_snippet, get_set_as_default_snippet
 from springfield.cms.models import FreeFormPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_mobile_store_qr_code():
diff --git a/springfield/cms/fixtures/homepage_fixtures.py b/springfield/cms/fixtures/homepage_fixtures.py
@@ -9,7 +9,7 @@
 from springfield.cms.fixtures.snippet_fixtures import get_pre_footer_cta_snippet
 from springfield.cms.models import HomePage
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_home_intro():
diff --git a/springfield/cms/fixtures/icon_list_with_image_2026_fixtures.py b/springfield/cms/fixtures/icon_list_with_image_2026_fixtures.py
@@ -7,7 +7,7 @@
 from springfield.cms.fixtures.base_fixtures import get_2026_test_index_page, get_placeholder_images
 from springfield.cms.models import FreeFormPage2026
 
-_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def _section(heading_text, content_blocks, section_id, subheading_text=""):
diff --git a/springfield/cms/fixtures/inline_notification_fixtures.py b/springfield/cms/fixtures/inline_notification_fixtures.py
@@ -5,7 +5,7 @@
 from springfield.cms.fixtures.base_fixtures import get_test_index_page
 from springfield.cms.models import FreeFormPage
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_inline_notification_variants() -> list[dict]:
diff --git a/springfield/cms/fixtures/kit_banner_fixtures.py b/springfield/cms/fixtures/kit_banner_fixtures.py
@@ -6,7 +6,7 @@
 from springfield.cms.fixtures.button_fixtures import get_button_variants
 from springfield.cms.models import FreeFormPage, FreeFormPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_kit_banner_variants():
diff --git a/springfield/cms/fixtures/media_content_fixtures.py b/springfield/cms/fixtures/media_content_fixtures.py
@@ -11,7 +11,7 @@
 from springfield.cms.fixtures.video_fixtures import get_video_variants
 from springfield.cms.models import FreeFormPage
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_media_content_variants() -> list[dict]:
diff --git a/springfield/cms/fixtures/notification_fixtures.py b/springfield/cms/fixtures/notification_fixtures.py
@@ -5,7 +5,7 @@
 from springfield.cms.fixtures.base_fixtures import get_2026_test_index_page
 from springfield.cms.models import FreeFormPage2026
 
-_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+_SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_notification_variants() -> list[dict]:
diff --git a/springfield/cms/fixtures/thanks_page_fixtures.py b/springfield/cms/fixtures/thanks_page_fixtures.py
@@ -76,7 +76,15 @@ def get_windows_section():
     return {
         "type": "section",
         "value": {
-            "settings": {"show_to": {"platforms": ["windows"], "firefox": "", "auth_state": ""}, "anchor_id": ""},
+            "settings": {
+                "show_to": {
+                    "platforms": ["windows"],
+                    "firefox": "",
+                    "auth_state": "",
+                    "default_browser": "",
+                },
+                "anchor_id": "",
+            },
             "heading": {
                 "superheading_text": "Windows Users",
                 "heading_text": '<p data-block-key="x4k4z">Thank you for downloading Firefox!</p>',
@@ -93,7 +101,15 @@ def get_linux_section():
     return {
         "type": "section",
         "value": {
-            "settings": {"show_to": {"platforms": ["linux"], "firefox": "", "auth_state": ""}, "anchor_id": ""},
+            "settings": {
+                "show_to": {
+                    "platforms": ["linux"],
+                    "firefox": "",
+                    "auth_state": "",
+                    "default_browser": "",
+                },
+                "anchor_id": "",
+            },
             "heading": {
                 "superheading_text": "Linux Users",
                 "heading_text": '<p data-block-key="x4k4z">Almost there!</p>',
@@ -110,7 +126,15 @@ def get_unsupported_section():
     return {
         "type": "section",
         "value": {
-            "settings": {"show_to": {"platforms": ["unsupported"], "firefox": "", "auth_state": ""}, "anchor_id": ""},
+            "settings": {
+                "show_to": {
+                    "platforms": ["unsupported"],
+                    "firefox": "",
+                    "auth_state": "",
+                    "default_browser": "",
+                },
+                "anchor_id": "",
+            },
             "heading": {
                 "superheading_text": "Unsupported OS Users",
                 "heading_text": '<p data-block-key="x4k4z">Your download was interrupted. But all is not lost.</p>',
@@ -127,7 +151,15 @@ def get_other_os_section():
     return {
         "type": "section",
         "value": {
-            "settings": {"show_to": {"platforms": ["other-os", "android", "ios"], "firefox": "", "auth_state": ""}, "anchor_id": ""},
+            "settings": {
+                "show_to": {
+                    "platforms": ["other-os", "android", "ios"],
+                    "firefox": "",
+                    "auth_state": "",
+                    "default_browser": "",
+                },
+                "anchor_id": "",
+            },
             "heading": {
                 "superheading_text": "Other OS Users",
                 "heading_text": '<p data-block-key="x4k4z">Thank you for downloading Firefox!</p>',
@@ -146,7 +178,15 @@ def get_mac_section():
     return {
         "type": "section",
         "value": {
-            "settings": {"show_to": {"platforms": ["osx"], "firefox": "", "auth_state": ""}, "anchor_id": ""},
+            "settings": {
+                "show_to": {
+                    "platforms": ["osx"],
+                    "firefox": "",
+                    "auth_state": "",
+                    "default_browser": "",
+                },
+                "anchor_id": "",
+            },
             "heading": {
                 "superheading_text": "Mac Users",
                 "heading_text": '<p data-block-key="x4k4z">Thank you for downloading Firefox!</p>',
diff --git a/springfield/cms/fixtures/topic_list_fixtures.py b/springfield/cms/fixtures/topic_list_fixtures.py
@@ -7,7 +7,7 @@
 from springfield.cms.fixtures.button_fixtures import get_button_variants
 from springfield.cms.models import FreeFormPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def _get_topics(anchor_prefix):
diff --git a/springfield/cms/fixtures/whats_new_page_fixtures.py b/springfield/cms/fixtures/whats_new_page_fixtures.py
@@ -7,7 +7,7 @@
 from springfield.cms.fixtures.snippet_fixtures import get_qr_code_snippet
 from springfield.cms.models import WhatsNewIndexPage, WhatsNewPage, WhatsNewPage2026
 
-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}
+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}
 
 
 def get_whatsnew_index_page() -> WhatsNewIndexPage:
diff --git a/springfield/cms/management/commands/load_page_fixtures.py b/springfield/cms/management/commands/load_page_fixtures.py
@@ -154,8 +154,8 @@ def handle(self, *args, **options):
         article_theme_page = get_article_theme_page()
         self.stdout.write(self.style.SUCCESS(f"Article Theme test page loaded: {article_theme_page.slug}"))
 
-        artcle_theme_hub_page = get_article_theme_hub_page()
-        self.stdout.write(self.style.SUCCESS(f"Article Theme Hub test page loaded: {artcle_theme_hub_page.slug}"))
+        article_theme_hub_page = get_article_theme_hub_page()
+        self.stdout.write(self.style.SUCCESS(f"Article Theme Hub test page loaded: {article_theme_hub_page.slug}"))
 
         whats_new_index_page = get_whatsnew_index_page()
         self.stdout.write(self.style.SUCCESS(f"What's New Index test page loaded: {whats_new_index_page.slug}"))
diff --git a/springfield/cms/migrations/0060_setasdefaultsnippet.py b/springfield/cms/migrations/0060_setasdefaultsnippet.py
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-# Generated by Django 5.2.12 on 2026-03-30 16:47
+# Generated by Django 5.2.12 on 2026-04-01 20:16
 
 import uuid
 
@@ -16,7 +16,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("cms", "0058_qrcodesnippet_content_and_more"),
+        ("cms", "0059_alter_freeformpage2026_content"),
         ("wagtailcore", "0096_referenceindex_referenceindex_source_object_and_more"),
     ]
 
diff --git a/springfield/cms/templates/cms/blocks/filled-card.html b/springfield/cms/templates/cms/blocks/filled-card.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:card fill="true" expand_link="{{ value.settings.expand_link }}">
     <content:heading>
       <div>
diff --git a/springfield/cms/templates/cms/blocks/icon-card.html b/springfield/cms/templates/cms/blocks/icon-card.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:card expand_link="{{ value.settings.expand_link }}">
     <content:pre_heading>
       <div class="fl-card-icon">
diff --git a/springfield/cms/templates/cms/blocks/illustration-card-2026.html b/springfield/cms/templates/cms/blocks/illustration-card-2026.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:illustration-card-2026
     expand_link="{{ value.settings.expand_link }}"
   >
diff --git a/springfield/cms/templates/cms/blocks/illustration-card.html b/springfield/cms/templates/cms/blocks/illustration-card.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:illustration-card
     image_after="{{ value.settings.image_after }}"
     expand_link="{{ value.settings.expand_link }}"
diff --git a/springfield/cms/templates/cms/blocks/inline-notification.html b/springfield/cms/templates/cms/blocks/inline-notification.html
@@ -9,7 +9,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:inline-notification
     message="{{ value.message|richtext|remove_p_tag }}"
     icon="{{ value.settings.icon }}"
diff --git a/springfield/cms/templates/cms/blocks/notification.html b/springfield/cms/templates/cms/blocks/notification.html
@@ -9,7 +9,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:notification
     icon="{{ value.settings.icon }}"
     color="{{ value.settings.color }}"
diff --git a/springfield/cms/templates/cms/blocks/outlined-card.html b/springfield/cms/templates/cms/blocks/outlined-card.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:card expand_link="{{ value.settings.expand_link }}">
     <content:heading>
       {% if value.sticker %}
diff --git a/springfield/cms/templates/cms/blocks/sections/banner.html b/springfield/cms/templates/cms/blocks/sections/banner.html
@@ -15,7 +15,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
 
   <include:banner
     theme="{{ value.settings.theme }}"
diff --git a/springfield/cms/templates/cms/blocks/sections/home-carousel.html b/springfield/cms/templates/cms/blocks/sections/home-carousel.html
@@ -20,7 +20,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:carousel has_kit="true" items="{{ items }}">
     <content:heading>
       {% include_block value.heading %}
diff --git a/springfield/cms/templates/cms/blocks/sections/home-kit-banner.html b/springfield/cms/templates/cms/blocks/sections/home-kit-banner.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:kit-banner
     theme="{{ 'with-qr' if value.qr_code else 'diving-in' }}"
     qr_code="{{ value.qr_code }}"
diff --git a/springfield/cms/templates/cms/blocks/sections/kit-banner.html b/springfield/cms/templates/cms/blocks/sections/kit-banner.html
@@ -10,7 +10,8 @@
 <include:conditional-display
   platform_conditions="{{ value.settings.show_to.platforms }}"
   firefox_condition="{{ value.settings.show_to.firefox }}"
-  auth_state_condition="{{ value.settings.show_to.auth_state }}">
+  auth_state_condition="{{ value.settings.show_to.auth_state }}"
+  default_browser_condition="{{ value.settings.show_to.default_browser }}">
   <include:kit-banner theme="{{ value.settings.theme }}" anchor_id="{{ value.settings.anchor_id }}">
 
     <content:heading>
diff --git a/springfield/cms/templates/cms/blocks/sections/section.html b/springfield/cms/templates/cms/blocks/sections/section.html
diff --git a/springfield/cms/templates/cms/blocks/step-card.html b/springfield/cms/templates/cms/blocks/step-card.html
diff --git a/springfield/cms/templates/cms/blocks/sticker-card-2026.html b/springfield/cms/templates/cms/blocks/sticker-card-2026.html
diff --git a/springfield/cms/templates/cms/blocks/sticker-card.html b/springfield/cms/templates/cms/blocks/sticker-card.html
diff --git a/springfield/cms/templates/cms/snippets/set-as-default-snippet.html b/springfield/cms/templates/cms/snippets/set-as-default-snippet.html
diff --git a/springfield/cms/templates/components/conditional-display.html b/springfield/cms/templates/components/conditional-display.html

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."`
`18`	`18`	`)`
`19`	`19`
`20`		`-SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": ""}`
	`20`	`+SHOW_TO_ALL = {"platforms": [], "firefox": "", "auth_state": "", "default_browser": ""}`
`21`	`21`
`22`	`22`
`23`	`23`	`def create_article(`