From 583f6ab686a7e0394555370ca9db26d2c5ccedb3 Mon Sep 17 00:00:00 2001
From: wen-2018 <42974891+wen-2018@users.noreply.github.com>
Date: Tue, 3 Mar 2026 15:55:24 -0400
Subject: [PATCH] WT-786 smart window changes
---
bedrock/legal/templates/legal/index.html | 3 +++
.../legal/templates/legal/terms/smart-window.html | 9 +++++++++
bedrock/legal/urls.py | 5 +++++
.../privacy/templates/privacy/base-protocol.html | 1 +
.../templates/privacy/notices/smart-window.html | 15 +++++++++++++++
bedrock/privacy/urls.py | 1 +
bedrock/privacy/views.py | 2 ++
l10n/en/mozorg/about/legal.ftl | 2 ++
l10n/en/privacy/index.ftl | 1 +
tests/functional/test_generated_pages.py | 1 +
10 files changed, 40 insertions(+)
create mode 100644 bedrock/legal/templates/legal/terms/smart-window.html
create mode 100644 bedrock/privacy/templates/privacy/notices/smart-window.html
diff --git a/bedrock/legal/templates/legal/index.html b/bedrock/legal/templates/legal/index.html
index fec0be5d960..ea48a450e18 100644
--- a/bedrock/legal/templates/legal/index.html
+++ b/bedrock/legal/templates/legal/index.html
@@ -88,6 +88,9 @@ {{ ftl('legal-downloadable-software-notices') }}
{{ ftl('legal-thunderbird') }}
+
+ {{ ftl('legal-smart-window') }}
+
{% endblock %}
diff --git a/bedrock/legal/templates/legal/terms/smart-window.html b/bedrock/legal/templates/legal/terms/smart-window.html
new file mode 100644
index 00000000000..0640f0b3702
--- /dev/null
+++ b/bedrock/legal/templates/legal/terms/smart-window.html
@@ -0,0 +1,9 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ 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/.
+#}
+
+{% extends "legal/docs-base.html" %}
+
+{% block page_title %}{{ ftl('legal-smart-window-rights') }}{% endblock %}
diff --git a/bedrock/legal/urls.py b/bedrock/legal/urls.py
index 7907c78f579..f1447c16606 100644
--- a/bedrock/legal/urls.py
+++ b/bedrock/legal/urls.py
@@ -31,6 +31,11 @@
LegalDocView.as_view(template_name="legal/terms/thunderbird.html", legal_doc_name="thunderbird_about_rights"),
name="legal.terms.thunderbird",
),
+ path(
+ "terms/smart-window/",
+ LegalDocView.as_view(template_name="legal/terms/smart-window.html", legal_doc_name="smart_window_about_rights"),
+ name="legal.terms.smart_window",
+ ),
path(
"terms/mdn-plus/",
LegalDocView.as_view(template_name="legal/terms/mdn-plus.html", legal_doc_name="mdn_plus_terms"),
diff --git a/bedrock/privacy/templates/privacy/base-protocol.html b/bedrock/privacy/templates/privacy/base-protocol.html
index b03628fc758..e5d244d23af 100644
--- a/bedrock/privacy/templates/privacy/base-protocol.html
+++ b/bedrock/privacy/templates/privacy/base-protocol.html
@@ -37,6 +37,7 @@
(focus_url, 'privacy-focus', focus_name),
(url('privacy.notices.thunderbird'), 'privacy-thunderbird', ftl('privacy-index-thunderbird')),
(url('privacy.notices.mdn-plus'), 'privacy-mdn-plus', ftl('privacy-index-mdn-plus')),
+ (url('privacy.notices.smart_window'), 'privacy-smart-window', ftl('privacy-index-smart-window')),
] -%}
{% block content %}
diff --git a/bedrock/privacy/templates/privacy/notices/smart-window.html b/bedrock/privacy/templates/privacy/notices/smart-window.html
new file mode 100644
index 00000000000..f65c2a64a49
--- /dev/null
+++ b/bedrock/privacy/templates/privacy/notices/smart-window.html
@@ -0,0 +1,15 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ 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/.
+#}
+
+{% extends "privacy/notices/base-notice.html" %}
+
+{% set body_id = "privacy-smart-window" %}
+{% block body_class %}mzp-t-mozilla format-none{% endblock%}
+
+{% block article_header_logo %}{% endblock %}
+
+{# Disable GA on Smart Window Privacy Notice. Similar to Issue 9426 #}
+{% block google_analytics %}{% endblock %}
diff --git a/bedrock/privacy/urls.py b/bedrock/privacy/urls.py
index 1635140fd2d..494ae31ee2c 100644
--- a/bedrock/privacy/urls.py
+++ b/bedrock/privacy/urls.py
@@ -18,6 +18,7 @@
# bug 1319207 - special URL for Firefox Focus in de locale
path("firefox-klar/", views.firefox_focus_notices, name="privacy.notices.firefox-klar"),
path("thunderbird/", views.thunderbird_notices, name="privacy.notices.thunderbird"),
+ path("smart-window/", views.smart_window_notices, name="privacy.notices.smart_window"),
path("websites/", views.websites_notices, name="privacy.notices.websites"),
page("websites/data-preferences/", "privacy/data-preferences.html", ftl_files=["privacy/data-preferences"]),
page("websites/cookie-settings/", "privacy/cookie-settings.html", ftl_files=["privacy/cookie-settings"]),
diff --git a/bedrock/privacy/views.py b/bedrock/privacy/views.py
index 7b9e50ff887..a60663fb0e4 100644
--- a/bedrock/privacy/views.py
+++ b/bedrock/privacy/views.py
@@ -104,6 +104,8 @@ def get_legal_doc(self):
thunderbird_notices = PrivacyDocView.as_view(template_name="privacy/notices/thunderbird.html", legal_doc_name="thunderbird_privacy_policy")
+smart_window_notices = PrivacyDocView.as_view(template_name="privacy/notices/smart-window.html", legal_doc_name="smart_window_privacy_notice")
+
websites_notices = PrivacyDocView.as_view(template_name="privacy/notices/websites.html", legal_doc_name="websites_privacy_notice")
mdn_plus = PrivacyDocView.as_view(template_name="privacy/notices/mdn-plus.html", legal_doc_name="mdn_plus_privacy")
diff --git a/l10n/en/mozorg/about/legal.ftl b/l10n/en/mozorg/about/legal.ftl
index b5eca9c85cb..9b936261119 100644
--- a/l10n/en/mozorg/about/legal.ftl
+++ b/l10n/en/mozorg/about/legal.ftl
@@ -23,6 +23,8 @@ legal-firefox = { -brand-name-firefox }
legal-firefox-rights = { -brand-name-firefox }: About Your Rights
legal-thunderbird = { -brand-name-thunderbird }
legal-thunderbird-rights = { -brand-name-thunderbird }: About Your Rights
+legal-smart-window = Smart Window
+legal-smart-window-rights = Smart Window: About Your Rights
legal-websites-and-communications = Websites & Communications Terms of Use
legal-acceptable-use-policy = Acceptable Use Policy
legal-firefox-cloud-services = { -brand-name-firefox } Cloud Services: Terms of Service
diff --git a/l10n/en/privacy/index.ftl b/l10n/en/privacy/index.ftl
index 43bee2b3fc8..155b915ea60 100644
--- a/l10n/en/privacy/index.ftl
+++ b/l10n/en/privacy/index.ftl
@@ -42,6 +42,7 @@ privacy-index-firefox-browser = { -brand-name-firefox-browser }
privacy-index-firefox-focus = { -brand-name-firefox-focus }
privacy-index-thunderbird = { -brand-name-thunderbird }
privacy-index-mdn-plus = { -brand-name-mdn-plus }
+privacy-index-smart-window = Smart Window
privacy-index-mozilla-subscription-services = { -brand-name-mozilla } Subscription Services
# This is title case since it appears in a menu, so does not use the normal brand name terms for "Mozilla accounts".
diff --git a/tests/functional/test_generated_pages.py b/tests/functional/test_generated_pages.py
index d8acdd0ff4a..10bb6278841 100644
--- a/tests/functional/test_generated_pages.py
+++ b/tests/functional/test_generated_pages.py
@@ -22,6 +22,7 @@ def pytest_generate_tests(metafunc):
"/about/legal/terms/firefox-hello/",
"/about/legal/terms/firefox/",
"/about/legal/terms/thunderbird/",
+ "/about/legal/terms/smart-window/",
"/credits/",
"/privacy/",
"/privacy/principles/",