Remove Firefox pages and assets migrated to springfield

bedrock/base/templates/includes/protocol/navigation/menus/products.html

@@ -22,15 +22,6 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-monitor') }}</h4>
               </a>
             </section>
           </li>
-          <li>
-            <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.facebookcontainer.index') }}" data-link-text="Facebook Container" data-link-position="topnav - products">
-                <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#f80073" d="M27 1H5C2.8 1 1 2.8 1 5v22c0 2.2 1.8 4 4 4h22c2.2 0 4-1.8 4-4V5c0-2.2-1.8-4-4-4z"></path><path fill="#fff" d="M26 8.8l-1.4-1.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8h-2.3V8.9L19 7.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8h-2.3V8.9l-1.4-1.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8H9.2V8.9L7.8 7.4c-.1-.1-.2-.1-.3 0L6 8.8l-.1.1v15c0 .1.1.2.2.2H9c.1 0 .2-.1.2-.2v-2.8h2.3V24c0 .1.1.2.2.2h2.8c.1 0 .2-.1.2-.2v-2.8H17V24c0 .1.1.2.2.2H20c.1 0 .2-.1.2-.2v-2.8h2.3V24c0 .1.1.2.2.2h2.8c.1 0 .2-.1.2-.2V9c.4-.1.3-.2.3-.2zm-14.7 11H9.2v-6.6h2.3v6.6h-.2zm5.6 0h-2.1v-6.6h2.3v6.6h-.2zm5.7 0h-2.1v-6.6h2.3v6.6h-.2z"></path></svg>
-                <h4 class="c-menu-item-title">{{ ftl('navigation-v2-facebook-container') }}</h4>
-                <p class="c-menu-item-desc">{{ ftl('navigation-v2-help-prevent-facebook-from') }}</p>
-              </a>
-            </section>
-          </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-position="topnav - products">

bedrock/firefox/redirects.py

@@ -237,6 +237,8 @@ def _redirect_to_same_path_on_fxc(request, *args, **kwargs):
     offsite_redirect(r"^firefox/mac/$", f"{FXC}/browsers/desktop/mac/", permanent=True),
     offsite_redirect(r"^firefox/mobile/get-app/$", f"{FXC}/browsers/mobile/get-app/", permanent=True),
     offsite_redirect(r"^firefox/more/$", f"{FXC}/more/", permanent=True),
+    offsite_redirect(r"^firefox/more/misinformation/$", f"{FXC}/features/", permanent=True),
+    offsite_redirect(r"^firefox/nothing-personal/$", f"{FXC}/", permanent=True),
     offsite_redirect(r"^firefox/set-as-default/$", f"{FXC}/landing/set-as-default/", permanent=True),
     offsite_redirect(r"^firefox/set-as-default/thanks/$", f"{FXC}/landing/set-as-default/thanks/", permanent=True),
     offsite_redirect(r"^firefox/unsupported-systems/$", f"{FXC}/browsers/unsupported-systems/", permanent=True),
@@ -803,7 +805,8 @@ def _redirect_to_same_path_on_fxc(request, *args, **kwargs):
     redirect(r"^firefox/privacy/products/?$", "products.landing"),
     redirect(r"^firefox/privacy/safe-passwords/?$", "firefox.features.password-manager"),
     redirect(r"^firefox/privacy/book/?$", "https://support.mozilla.org/kb/how-stay-safe-web"),
-    redirect(r"^firefox/nothingpersonal/?$", "firefox.nothing-personal.index"),
+    redirect(r"^firefox/nothingpersonal/?$", f"{FXC}/", permanent=True),
+    redirect(r"^firefox/facebookcontainer/?$", "https://addons.mozilla.org/firefox/addon/facebook-container/", permanent=True),
     # issue 15841
     redirect(r"^firefox/tech/?$", "firefox.landing.tech"),
     # issue 16089, 16159

bedrock/firefox/templates/firefox/browsers/compare/index.html

@@ -31,7 +31,6 @@ <h3 class="c-compare-item-title">{{ title }}</h3>
 {% block body_class %}compare-index{% endblock %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}

bedrock/firefox/templates/firefox/browsers/mobile/android.html

@@ -50,7 +50,6 @@
 {% endblock %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}

bedrock/firefox/templates/firefox/browsers/mobile/focus.html

@@ -46,7 +46,6 @@
 {% endblock %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}

bedrock/firefox/templates/firefox/browsers/mobile/get-app.html

@@ -30,7 +30,6 @@
 {% set ios_url = app_store_url('firefox', 'firefox-browsers-mobile-get-app') %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}

bedrock/firefox/templates/firefox/browsers/mobile/index.html

@@ -37,7 +37,6 @@
 {% endblock %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}

bedrock/firefox/templates/firefox/browsers/mobile/ios.html

@@ -50,7 +50,6 @@
 {% endblock %}
 
 {% block sub_navigation %}
-  {% include 'firefox/includes/sub-nav-firefox.html' %}
 {% endblock %}
 
 {% block content %}