Remove old Firefox accounts promos / code (Fixes #13860) (#13862)

mozilla · Nov 6, 2023 · 3334c9b · 3334c9b
1 parent 526491a
commit 3334c9b
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 465 deletions.
diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html
@@ -117,12 +117,7 @@ <h2 class="mzp-c-form-title">{{ form_title }}</h2>
       {% if intro_text %}
         {{ intro_text }}
       {% else %}
-        {% if switch('moz-accounts-update') %}
-          {{ ftl('fxa-form-enter-your-email-v2', fallback='fxa-form-enter-your-email') }}
-        {% else %}
-          {{ ftl('fxa-form-enter-your-email') }}
-        {% endif %}
-
+        {{ ftl('fxa-form-enter-your-email-v2', fallback='fxa-form-enter-your-email') }}
       {% endif %}
       </p>
     </header>

diff --git a/bedrock/firefox/templates/firefox/accounts.html b/bedrock/firefox/templates/firefox/accounts.html
@@ -10,27 +10,13 @@
 
 {% set _entrypoint = 'mozilla.org-firefox-accounts' %}
 
-{%- block page_title -%}
-  {%- if switch('moz-accounts-update') -%}
-    {{ ftl('mozilla-accounts-get-a-mozilla-account', fallback='firefox-accounts-get-a-firefox-account') }}
-  {%- else -%}
-    {{ ftl('firefox-accounts-get-a-firefox-account') }}
-  {%- endif -%}
-{%- endblock -%}
-
-{%- block page_desc -%}
-  {{ ftl('firefox-accounts-securely-sync-your') }}
-{%- endblock -%}
+{% block page_title %}{{ ftl('mozilla-accounts-get-a-mozilla-account', fallback='firefox-accounts-get-a-firefox-account') }}{% endblock %}
+
+{% block page_desc %}{{ ftl('firefox-accounts-securely-sync-your') }}{% endblock %}
 
 {% block page_image %}{{ static('img/firefox/template/page-image-master.jpg') }}{% endblock %}
 
-{%- block page_favicon -%}
-  {%- if switch('moz-accounts-update') -%}
-    {{ static('img/favicons/mozilla/favicon.ico') }}
-  {%- else -%}
-    {{ static('img/favicons/firefox/favicon.ico') }}
-  {%- endif -%}
-{%- endblock -%}
+{% block page_favicon %}{{ static('img/favicons/mozilla/favicon.ico') }}{% endblock %}
 
 {% block page_favicon_large %}{{ static('img/favicons/firefox/favicon-196x196.png') }}{% endblock %}
 {% block page_ios_icon %}{{ static('img/favicons/firefox/apple-touch-icon.png') }}{% endblock %}
@@ -53,12 +39,7 @@
     <div class="c-sub-navigation-content">
       <h2 class="c-sub-navigation-title is-summary">
         <a href="{{ url('firefox.accounts') }}" data-link-type="nav" data-link-position="subnav" data-link-name="Firefox Accounts">
-          {% if switch('moz-accounts-update') %}
-            {{ ftl('sub-navigation-mozilla-account', fallback='sub-navigation-firefox-accounts') }}
-          {% else %}
-            <img class="c-sub-navigation-icon" src="{{ static('protocol/img/logos/firefox/logo.svg') }}" width="24" height="24" alt="">
-            {{ ftl('sub-navigation-firefox-accounts') }}
-          {% endif %}
+          {{ ftl('sub-navigation-mozilla-account', fallback='sub-navigation-firefox-accounts') }}
         </a>
       </h2>
       <ul class="c-sub-navigation-list is-details is-closed">
@@ -97,26 +78,15 @@ <h2 class="c-sub-navigation-title is-summary">
         </div>
 
         <div class="c-manage">
-
-          {% if switch('moz-accounts-update') %}
-            <p>{{ ftl('mozilla-accounts-already', fallback='firefox-accounts-already') }}</p>
-          {% else %}
-            <p>{{ ftl('firefox-accounts-already') }}</p>
-          {% endif %}
-
+          <p>{{ ftl('mozilla-accounts-already', fallback='firefox-accounts-already') }}</p>
           <a href="https://accounts.firefox.com/settings" id="manage">{{ ftl('firefox-accounts-manage') }}</a>
         </div>
       </div>
     </div>
     <div class="mzp-c-split-body">
 
       <div class="accounts-products">
-
-        {% if switch('moz-accounts-update') %}
-            <h2>{{ ftl('mozilla-account-sign-in-to', fallback='firefox-accounts-sign-in-to') }}</h2>
-          {% else %}
-            <h2>{{ ftl('firefox-accounts-sign-in-to') }}</h2>
-          {% endif %}
+        <h2>{{ ftl('mozilla-account-sign-in-to', fallback='firefox-accounts-sign-in-to') }}</h2>
 
         <a href="{{ url('firefox.browsers.index') }}"><h4 class="mzp-c-wordmark mzp-t-wordmark-sm mzp-t-product-firefox">{{ ftl('firefox-accounts-firefox-browser') }}</h4></a>
         <ul class="mzp-u-list-styled">

diff --git a/bedrock/firefox/templates/firefox/browsers/compare/brave.html b/bedrock/firefox/templates/firefox/browsers/compare/brave.html
@@ -246,7 +246,7 @@ <h2>{{ ftl('compare-shared-portability-strong') }}</h2>
                 breaches='href="https://monitor.firefox.com/breaches" rel="external noopener" data-cta-text="Data breaches" data-cta-type="link"'|safe
           ) }}
         </p>
-      {% elif switch('moz-accounts-update') %}
+      {% else %}
         <p>
           {{ ftl('compare-brave-the-firefox-browser-also-gives-v2',
                   fallback='compare-brave-the-firefox-browser-also-gives',
@@ -255,14 +255,6 @@ <h2>{{ ftl('compare-shared-portability-strong') }}</h2>
                   breaches='href="https://monitor.firefox.com/breaches" rel="external noopener" data-cta-text="Data breaches" data-cta-type="link"'|safe
           ) }}
         </p>
-      {% else %}
-        <p>
-          {{ ftl('compare-brave-the-firefox-browser-also-gives',
-                  accounts='href="%s" data-cta-type="link" data-cta-name="Firefox Account"'|safe|format(url('firefox.accounts')),
-                  monitor='href="https://monitor.firefox.com/" rel="external noopener" data-cta-text="Monitor" data-cta-type="link"'|safe,
-                  breaches='href="https://monitor.firefox.com/breaches" rel="external noopener" data-cta-text="Data breaches" data-cta-type="link"'|safe
-          ) }}
-        </p>
       {% endif %}
 
       <p>{{ ftl('compare-brave-brave-also-recently-gained') }}</p>

diff --git a/bedrock/firefox/templates/firefox/browsers/compare/safari.html b/bedrock/firefox/templates/firefox/browsers/compare/safari.html
@@ -182,11 +182,7 @@ <h2>{{ ftl('compare-shared-utility-strong') }}</h2>
 
       <p>{{ ftl('compare-safari-like-safari-firefox-encourages', attrs='href="https://addons.mozilla.org" rel="external noopener" data-cta-text="add-ons and extensions" data-cta-type="link"'|safe) }}</p>
 
-      {% if switch('moz-accounts-update') %}
-        <p>{{ ftl('compare-safari-also-when-you-sign-up-for-updated-v2', fallback='compare-safari-also-when-you-sign-up-for-updated', pocket='href="https://getpocket.com/" rel="external noopener" data-cta-text="Pocket" data-cta-type="link"'|safe) }}</p>
-        {% else %}
-          {{ ftl('compare-safari-also-when-you-sign-up-for-updated', pocket='href="https://getpocket.com/" rel="external noopener" data-cta-text="Pocket" data-cta-type="link"'|safe) }}
-      {% endif %}
+      <p>{{ ftl('compare-safari-also-when-you-sign-up-for-updated-v2', fallback='compare-safari-also-when-you-sign-up-for-updated', pocket='href="https://getpocket.com/" rel="external noopener" data-cta-text="Pocket" data-cta-type="link"'|safe) }}</p>
 
       <p>{{ ftl('compare-safari-firefox-is-also-great-for-video') }}</p>
 
@@ -242,11 +238,7 @@ <h2>{{ ftl('compare-shared-portability-strong') }}</h2>
 
       <p>{{ ftl('compare-safari-firefox-and-safari-both-provide') }}</p>
 
-      {% if switch('moz-accounts-update') %}
-        <p>{{ ftl('compare-safari-firefox-also-offers-a-similar-updated-v3', fallback='compare-safari-firefox-also-offers-a-similar-updated', attrs = 'href="%s" data-cta-type="link" data-cta-name="Mozilla account"'|safe|format(url('firefox.accounts'))) }}</p>
-      {% else %}
-        <p>{{ ftl('compare-safari-firefox-also-offers-a-similar-updated', attrs = 'href="%s" data-cta-type="link" data-cta-name="Firefox Account"'|safe|format(url('firefox.accounts'))) }}</p>
-      {% endif %}
+      <p>{{ ftl('compare-safari-firefox-also-offers-a-similar-updated-v3', fallback='compare-safari-firefox-also-offers-a-similar-updated', attrs = 'href="%s" data-cta-type="link" data-cta-name="Mozilla account"'|safe|format(url('firefox.accounts'))) }}</p>
 
       <p>{{ ftl('compare-safari-the-firefox-app-for-ios-and', ios='href="%s" rel="external noopener" data-cta-text="iOS" data-cta-type="link"'|safe|format(app_store_url('firefox')),
               android='href="%s" rel="external noopener" data-cta-text="Android" data-cta-type="link"'|safe|format(play_store_url('firefox'))) }}</p>

diff --git a/bedrock/firefox/templates/firefox/browsers/index.html b/bedrock/firefox/templates/firefox/browsers/index.html
@@ -28,10 +28,6 @@
   {{ css_bundle('protocol-emphasis-box')}}
   {{ css_bundle('firefox-browsers-products') }}
 
-  {% if switch('moz-accounts-update') %}
-    {{ css_bundle('moz-account-promo') }}
-  {% endif %}
-
   {% if show_firefox_app_store_banner %}
     {{ css_bundle('firefox-app-store-banner') }}
   {% endif %}
@@ -180,33 +176,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.enterprise.index') }}"
     </div>
   </div>
 
-
-  <!-- Mozilla accounts banner switch -->
-
-  {% if switch('moz-accounts-update') %}
-    {% include 'mozorg/includes/mozilla-account-form-promo.html' %}
-  {% else %}
-    <div class="mzp-l-content is-js-dependent">
-    <div class="mzp-c-emphasis-box mzp-t-dark t-account">
-      <div class="fxa-form-cta">
-        {{ fxa_email_form(
-          class_name='fxa-form',
-          entrypoint=_entrypoint,
-          form_title=ftl('firefox-browsers-join-firefox-and-get-the-most'),
-          button_class='mzp-c-button mzp-t-product mzp-t-lg'
-          )
-        }}
-        <p class="fxa-signin">
-          {% set fxa_link = fxa_link_fragment(entrypoint=_entrypoint, action='signin', optional_parameters={'utm_campaign': 'browsers-footer'}) %}
-          {% set fxa_attr = fxa_link ~ ' class="js-fxa-cta-link js-fxa-product-button" data-cta-type="link" data-cta-text="FxA Learn More"'|safe %}
-          {% set accounts_attr = 'href="'|safe ~ url('firefox.accounts') ~ '"'|safe %}
-          {{ ftl('firefox-browsers-already-have-an-account-sign-v2', fallback='firefox-browsers-already-have-an-account-sign', accounts_attr=accounts_attr, fxa_attr=fxa_attr) }}
-        </p>
-      </div>
-    </div>
-  </div>
-  {% endif %}
-
+  {% include 'mozorg/includes/mozilla-account-form-promo.html' %}
 </main>
 {% endblock %}
 

diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
@@ -25,10 +25,6 @@
   {{ css_bundle('protocol-emphasis-box')}}
   {{ css_bundle('firefox-browsers-products') }}
 
-  {% if switch('moz-accounts-update') %}
-    {{ css_bundle('moz-account-promo') }}
-  {% endif %}
-
   {% if show_firefox_app_store_banner %}
     {{ css_bundle('firefox-app-store-banner') }}
   {% endif %}
@@ -170,31 +166,7 @@ <h2>{{ ftl('browsers-mobile-see-how-firefox-for-desktop-compare') }}</h2>
     </div>
   </section>
 
-  <!-- Mozilla accounts banner switch -->
-  {% if switch('moz-accounts-update') %}
-    {% include 'mozorg/includes/mozilla-account-form-promo.html' %}
-  {% else %}
-    <section class="mzp-l-content is-js-dependent">
-      <div class="mzp-c-emphasis-box mzp-t-dark t-account">
-        <div class="fxa-form-cta">
-          {{ fxa_email_form(
-            class_name='fxa-form',
-            entrypoint=_entrypoint,
-            form_title=ftl('browsers-mobile-join-firefox-and-get-the-most'),
-            button_class='mzp-c-button mzp-t-product mzp-t-lg'
-            )
-          }}
-          <p class="fxa-signin">
-            {% set fxa_link = fxa_link_fragment(entrypoint=_entrypoint, action='signin', optional_parameters={'utm_campaign': 'browsers-footer'}) %}
-            {% set fxa_attr = fxa_link ~ ' class="js-fxa-cta-link js-fxa-product-button" data-cta-type="link" data-cta-text="FxA Learn More"'|safe %}
-            {% set accounts_attr = 'href="'|safe ~ url('firefox.accounts') ~ '"'|safe %}
-            {{ ftl('browsers-mobile-already-have-an-account-sign', accounts_attr=accounts_attr, fxa_attr=fxa_attr) }}
-          </p>
-        </div>
-      </div>
-    </section>
-  {% endif %}
-
+  {% include 'mozorg/includes/mozilla-account-form-promo.html' %}
 
 </main>
 {% endblock %}

diff --git a/bedrock/firefox/templates/firefox/features/password-manager.html b/bedrock/firefox/templates/firefox/features/password-manager.html
@@ -10,14 +10,10 @@
 {% block page_desc %}{{ ftl('password-manager-firefox-password-manager-saves-all') }}{% endblock %}
 
 {% block article_content %}
-  <p>{{ ftl('password-manager-firefox-securely-stores-your') }}</p>
+<p>{{ ftl('password-manager-firefox-securely-stores-your') }}</p>
 
-  {% if switch('moz-accounts-update') %}
-    {% set fxa = 'href="%s"'|safe|format(url('firefox.accounts')) %}
-    <p>{{ ftl('password-manager-with-a-free-mozilla-account-v2', fallback='password-manager-with-a-free-firefox-account', fxa=fxa) }}</p>
-  {% else %}
-    <p>{{ ftl('password-manager-with-a-free-firefox-account', fxa=url('firefox.accounts')) }}</p>
-  {% endif %}
+{% set fxa = 'href="%s"'|safe|format(url('firefox.accounts')) %}
+<p>{{ ftl('password-manager-with-a-free-mozilla-account-v2', fallback='password-manager-with-a-free-firefox-account', fxa=fxa) }}</p>
 
 <h2>{{ ftl('password-manager-password-autofill-for-easy-logins') }}</h2>
 <p>{{ ftl('password-manager-firefox-can-automatically-fill-in') }}</p>

diff --git a/bedrock/firefox/templates/firefox/features/sync.html b/bedrock/firefox/templates/firefox/features/sync.html
@@ -12,13 +12,8 @@
 {% block article_content %}
 <p>{{ ftl('features-sync-with-firefox-you-can-pick-up-where') }}</p>
 
-  {% if switch('moz-accounts-update') %}
-    {% set fxa = 'href="%s"'|safe|format(url('firefox.accounts')) %}
-    <p>{{ ftl('features-sync-sign-up-for-a-free-mozilla-account-v3', fallback='features-sync-sign-up-for-a-free-firefox-account', fxa=fxa) }}</p>
-  {% else %}
-    <p>{{ ftl('features-sync-sign-up-for-a-free-firefox-account', fxa=url('firefox.accounts')) }}</p>
-  {% endif %}
-
+{% set fxa = 'href="%s"'|safe|format(url('firefox.accounts')) %}
+<p>{{ ftl('features-sync-sign-up-for-a-free-mozilla-account-v3', fallback='features-sync-sign-up-for-a-free-firefox-account', fxa=fxa) }}</p>
 
 <figure class="c-article-figure">
   {{ resp_img(

diff --git a/bedrock/firefox/templates/firefox/home/index-master.html b/bedrock/firefox/templates/firefox/home/index-master.html
@@ -32,10 +32,6 @@
   {{ css_bundle('protocol-split') }}
   {{ css_bundle('firefox-master') }}
 
-  {% if switch('moz-accounts-update') %}
-    {{ css_bundle('moz-account-promo') }}
-  {% endif %}
-
   {% if show_firefox_app_store_banner %}
     {{ css_bundle('firefox-app-store-banner') }}
   {% endif %}
@@ -231,62 +227,7 @@ <h4>{{ ftl('firefox-home-un-spam-your-life') }}</h4>
       <a class="mzp-c-cta-link" href="{{ 'https://relay.firefox.com/' + referrals }}" data-link-name="Relay" data-link-type="link">{{ ftl('firefox-home-try-relay') }}</a>
     {% endcall %}
 
-    <!-- Mozilla accounts banner switch -->
-
-    {% if switch('moz-accounts-update') %}
-      {% include 'mozorg/includes/mozilla-account-cta-promo.html' %}
-    {% else %}
-      <div class="c-end mzp-t-dark">
-        <div class="mzp-l-content">
-          <div class="c-showcase t-small">
-              <ul class="c-showcase-list">
-                <li>
-                  <a class="mzp-c-cta-link" href="{{ url('firefox.browsers.index') }}" data-cta-type="link" data-cta-text="Browsers">
-                    <img alt="" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" height="40" width="40"><br>
-                    {{ ftl('firefox-home-browsers') }}
-                  </a>
-                </li>
-                <li>
-                  <a class="mzp-c-cta-link" href="https://monitor.firefox.com{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Monitor">
-                    <img alt="" src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" height="40" width="40"><br>
-                    {{ ftl('firefox-home-monitor') }}
-                  </a>
-                </li>
-                <li>
-                  <a class="mzp-c-cta-link" href="{{ url('products.vpn.landing') }}" data-cta-type="link" data-cta-text="Mozilla VPN">
-                    <img alt="" src="{{ static('protocol/img/logos/mozilla/vpn/logo-flat-white.svg') }}" height="40" width="40"><br>
-                    {{ ftl('firefox-home-mozilla-vpn') }}
-                  </a>
-                </li>
-                <li>
-                  <a class="mzp-c-cta-link" href="https://getpocket.com{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Pocket">
-                    <img alt="" src="{{ static('img/logos/pocket/logo.svg') }}" height="40" width="40"><br>
-                    {{ ftl('firefox-home-pocket') }}
-                  </a>
-                </li>
-                <li>
-                  <a class="mzp-c-cta-link" href="https://relay.firefox.com/{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Relay">
-                    <img alt="" src="{{ static('protocol/img/logos/firefox/relay/logo-white.svg') }}" height="40" width="40"><br>
-                    {{ ftl('firefox-home-relay') }}
-                  </a>
-                </li>
-              </ul>
-          </div>
-          <h2 class="c-end-title">{{ ftl('firefox-home-one-login-all-your') }}</h2>
-          <div class="mzp-c-button-download-container">
-            {{ fxa_button(
-              entrypoint='mozilla.org-firefox_home',
-              button_text=ftl('firefox-home-join-firefox'),
-              optional_parameters={'utm_campaign': 'firefox-home', 'utm_content': 'secondary-join-firefox'},
-              optional_attributes={'data-cta-text': 'Join Firefox', 'data-cta-type': 'fxa-sync', 'data-cta-position': 'secondary'}
-            ) }}
-            <small class="mzp-c-button-download-privacy-link">
-              <a href="{{ url('firefox.accounts') }}">{{ ftl('firefox-home-learn-more-about-joining') }}</a>
-            </small>
-          </div>
-        </div>
-      </div>
-    {% endif %}
+    {% include 'mozorg/includes/mozilla-account-cta-promo.html' %}
 </main>
 {% endblock %}
 

diff --git a/bedrock/firefox/templates/firefox/new/desktop/download.html b/bedrock/firefox/templates/firefox/new/desktop/download.html
@@ -565,11 +565,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-facebook-container')
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-sync-your-devices') }}</h3>
         {% set available_attrs = fxa_link_fragment(entrypoint='mozilla.org-firefox-desktop') %}
 
-        {% if switch('moz-accounts-update') %}
-          <p>{{ ftl('firefox-desktop-download-firefox-is-available-v2', fallback='firefox-desktop-download-firefox-is-available', attrs=available_attrs) }}</p>
-        {% else %}
-          <p>{{ ftl('firefox-desktop-download-firefox-is-available', attrs=available_attrs) }}</p>
-        {% endif %}
+        <p>{{ ftl('firefox-desktop-download-firefox-is-available-v2', fallback='firefox-desktop-download-firefox-is-available', attrs=available_attrs) }}</p>
       </div>
 
       <div class="mzp-c-card js-animate">

diff --git a/bedrock/firefox/templates/firefox/pocket.html b/bedrock/firefox/templates/firefox/pocket.html
@@ -69,7 +69,7 @@ <h2>Capture What Fascinates You</h2>
     </div>
 
     <div class="mzp-l-content mzp-l-card-half">
-      {% set account_name = 'Mozilla account' if switch('moz-accounts-update') else 'Firefox account' %}
+      {% set account_name = 'Mozilla account' %}
       {{ card(
         class='mzp-c-card-medium',
         title='Save It Fast',

diff --git a/bedrock/firefox/templates/firefox/privacy/passwords.html b/bedrock/firefox/templates/firefox/privacy/passwords.html
@@ -96,22 +96,13 @@ <h2>{{ ftl('privacy-passwords-get-help-from') }}</h2>
 
     {% set url_sumo_manager = 'href="https://support.mozilla.org/kb/password-manager-remember-delete-edit-logins" rel="external noopener"' %}
 
-    {% if switch('moz-accounts-update') %}
-      <p>{{ ftl('privacy-passwords-when-youre-logged-v2', fallback='privacy-passwords-when-youre-logged', url_sumo_manager=url_sumo_manager) }}</p>
-    {% else %}
-      <p>{{ ftl('privacy-passwords-when-youre-logged', url_sumo_manager=url_sumo_manager) }}</p>
-    {% endif %}
+    <p>{{ ftl('privacy-passwords-when-youre-logged-v2', fallback='privacy-passwords-when-youre-logged', url_sumo_manager=url_sumo_manager) }}</p>
 
     <h2>{{ ftl('privacy-passwords-twofactor-authentication-2fa') }}</h2>
     <p>{{ ftl('privacy-passwords-2fa-is-a') }}</p>
     {% set url_sumo_2fa = 'href="https://support.mozilla.org/kb/secure-firefox-account-two-step-authentication" rel="external noopener"' %}
 
-    {% if switch('moz-accounts-update') %}
-      <p>{{ ftl('privacy-passwords-your-mozilla-account', fallback='privacy-passwords-your-firefox-account', url_sumo_2fa=url_sumo_2fa) }}</p>
-    {% else %}
-      <p>{{ ftl('privacy-passwords-your-firefox-account', url_sumo_2fa=url_sumo_2fa) }}</p>
-    {% endif %}
-
+    <p>{{ ftl('privacy-passwords-your-mozilla-account', fallback='privacy-passwords-your-firefox-account', url_sumo_2fa=url_sumo_2fa) }}</p>
 
     <img src="{{ static('img/firefox/privacy/passwords/accounts.png') }}" alt="" height="811" width="738">
     {% set url_2fa = 'href="https://2fa.directory" rel="external noopener"' %}