Remove refresh switch and associated fallbacks (#16138)

* Remove refresh swiches and fallbacks

- removed `m24-website-refresh`
- made new homepage permanent if translations exist
- made new nav permanent if translations exist
- made global nav logo change permanent
- added test for 3rd homepage template state

Author: stephaniehobson

bedrock/base/templates/base-error.html

@@ -16,7 +16,7 @@
   <div class="mzp-l-content">
     <div class="header-image">
       <a class="logo-mozilla" href="{{ url('mozorg.home') }}">
-        <img class="c-navigation-logo-image m24-logo" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ ftl('error-page-mozilla') }}"  width="192" height="46">
+        <img class="c-navigation-logo-image" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ ftl('error-page-mozilla') }}"  width="192" height="46">
       </a>
       <a class="logo-firefox" href="{{ url('firefox') }}"><img src="{{ static('protocol/img/logos/firefox/logo-word-hor.svg') }}" alt="{{ ftl('error-page-firefox') }}" width="140"></a>
     </div>

bedrock/base/templates/base-protocol-mozilla.html

@@ -9,14 +9,10 @@
 {% block body_class %}mzp-t-mozilla{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') %}
     {{ css_bundle('protocol-mozilla-2024') }}
     {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
       {{ css_bundle('m24-navigation-and-footer') }}
     {% else %}
       {{ css_bundle('legacy-navigation-and-footer') }}
     {% endif %}
-  {% else %}
-    {{ css_bundle('protocol-mozilla') }}
-  {% endif %}
 {% endblock %}

bedrock/base/templates/base-protocol.html

@@ -72,15 +72,11 @@
     <!--[if !IE]><!-->
     {# Global styles, hidden from IE9 and lower #}
     {% block site_css %}
-      {% if switch('m24-website-refresh') %}
-        {{ css_bundle('protocol-mozilla-2024') }}
-        {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
-          {{ css_bundle('m24-navigation-and-footer') }}
-        {% else %}
-          {{ css_bundle('legacy-navigation-and-footer') }}
-        {% endif %}
+      {{ css_bundle('protocol-mozilla-2024') }}
+      {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+        {{ css_bundle('m24-navigation-and-footer') }}
       {% else %}
-        {{ css_bundle('protocol-firefox') }}
+        {{ css_bundle('legacy-navigation-and-footer') }}
       {% endif %}
     {% endblock %}
 
@@ -144,7 +140,7 @@
         {{ js_bundle('lib') }}
         {{ js_bundle('fxa') }}
         {{ js_bundle('data') }}
-        {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+        {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
           {{ js_bundle('m24-ui') }}
         {% else %}
           {{ js_bundle('ui') }}

bedrock/base/templates/includes/protocol/footer/footer.html

@@ -6,13 +6,13 @@
 
 {% set utm_params = 'utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer' %}
 
-{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+{% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
   {% include 'includes/protocol/footer/footer-refresh.html' %}
 {% else %}
 <footer class="mzp-c-footer {% if theme_class %}{{ theme_class }}{% endif %}" id="colophon" role="contentinfo">
   <div class="mzp-l-content">
     <nav class="mzp-c-footer-primary">
-      <div class="mzp-c-footer-primary-logo{% if switch('m24-website-refresh') %} m24-logo{% endif %}">
+      <div class="mzp-c-footer-primary-logo">
         <a href="{{ url('mozorg.home') }}" data-link-position="footer" data-link-text="Mozilla">{{ ftl('footer-mozilla') }}</a>
       </div>
       <div class="mzp-c-footer-sections">

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

@@ -4,7 +4,7 @@
  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
 
-{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+{% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
   {% include 'includes/protocol/navigation/navigation-refresh.html' %}
 {% else %}
   {# Bug 1438302 Avoid duplicate content for en-CA and en-GB pages. #}
@@ -22,7 +22,7 @@
         <button class="c-navigation-menu-button" type="button" aria-controls="c-navigation-items" data-testid="navigation-menu-button">{{ ftl('navigation-v2-menu') }}</button>
         <div class="c-navigation-logo">
           <a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-position="nav">
-            <img class="c-navigation-logo-image m24-logo" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ logo_alt }}" width="88" height="21">
+            <img class="c-navigation-logo-image" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ logo_alt }}" width="88" height="21">
           </a>
         </div>
 

bedrock/firefox/templates/firefox/built-for-you/landing.de.html

@@ -14,7 +14,7 @@
 {% block page_image %}{{ static('img/firefox/built-for-you/meta-de.jpg') }}{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+  {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
     {{ css_bundle('m24-root') }}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% else %}

bedrock/firefox/templates/firefox/built-for-you/landing.fr.html

@@ -14,7 +14,7 @@
 {% block page_image %}{{ static('img/firefox/built-for-you/meta-fr.jpg') }}{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+  {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
     {{ css_bundle('m24-root') }}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% else %}

bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html

@@ -13,7 +13,7 @@
 {% block page_desc %}{{ seo_desc }}{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+  {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
     {{ css_bundle('m24-root') }}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% else %}

bedrock/firefox/templates/firefox/developer/firstrun.html

@@ -17,7 +17,7 @@
 {% block page_ios_icon %}{{ static('img/favicons/firefox/browser/developer/apple-touch-icon.png') }}{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+  {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
     {{ css_bundle('m24-root') }}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% else %}

bedrock/firefox/templates/firefox/developer/whatsnew.html

@@ -14,7 +14,7 @@
 {% block page_ios_icon %}{{ static('img/favicons/firefox/browser/developer/apple-touch-icon.png') }}{% endblock %}
 
 {% block site_css %}
-  {% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
+  {% if ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
     {{ css_bundle('m24-root') }}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% else %}