diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py index b1bc1755cd2..afc46328e18 100644 --- a/bedrock/firefox/redirects.py +++ b/bedrock/firefox/redirects.py @@ -27,13 +27,17 @@ def mobile_app(request, *args, **kwargs): campaign_options = [ "firefox-whatsnew", "firefox-whatsnew-120", + "firefox-whatsnew-121-us", + "firefox-whatsnew-121-gb", + "firefox-whatsnew-121-de", + "firefox-whatsnew-121-fr", "firefox-whatsnew-122", "firefox-welcome-4", "firefox-welcome-6", - "firefox-welcome-17", + "firefox-welcome-17-en", + "firefox-welcome-17-de", + "firefox-welcome-17-fr", "firefox-browsers-mobile-get-app", - "firefox-browsers-mobile-android", - "firefox-browsers-mobile-ios", "firefox-browsers-mobile-focus", ] diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html b/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html index 30360043227..b9ca3893fe0 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/get-app.html @@ -40,7 +40,7 @@

{{ ftl('firefox-mobile-get-firefox-mobile') }}

{% else %}

{{ ftl('firefox-mobile-scan-the-qr-code-to-get-started') }}

- +
{% endif %} diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html index 9547bc14f2d..1aaf891d09c 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-android.html @@ -14,7 +14,7 @@

{{ ftl('mobile-android-get-firefox-for') }}

{% else %}

{{ ftl('mobile-android-scan-the-qr-code-to-get-started') }}

- {{ ftl('mobile-android-scan-alt-text') }}
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-focus.html b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-focus.html index 2d01649e433..9a5334906bf 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-focus.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-focus.html @@ -10,14 +10,10 @@

{{ ftl('mobile-focus-get-firefox-focus') }}

{{ ftl('mobile-focus-scan-the-qr-code-to-get-started') }}

- {% if variation == 'pb' %} - {{ ftl('mobile-focus-scan-alt-text') }} + {% if LANG == 'de' %} + {{ ftl('mobile-focus-scan-alt-text') }} {% else %} - {% if LANG == 'de' %} - {{ ftl('mobile-focus-scan-alt-text') }} - {% else %} - {{ ftl('mobile-focus-scan-alt-text') }} - {% endif %} + {{ ftl('mobile-focus-scan-alt-text') }} {% endif %}
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html index 852e0208690..06359d2a1bf 100644 --- a/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html +++ b/bedrock/firefox/templates/firefox/browsers/mobile/includes/s2d-ios.html @@ -14,7 +14,7 @@

{{ ftl('mobile-ios-get-firefox-for') }}

{% else %}

{{ ftl('mobile-ios-scan-the-qr-code-to-get-started') }}

- {{ ftl('mobile-ios-scan-alt-text') }}
diff --git a/bedrock/firefox/templates/firefox/welcome/page17/page17-b.html b/bedrock/firefox/templates/firefox/welcome/page17/page17-b.html index 365d7474193..f704097af2b 100644 --- a/bedrock/firefox/templates/firefox/welcome/page17/page17-b.html +++ b/bedrock/firefox/templates/firefox/welcome/page17/page17-b.html @@ -23,7 +23,7 @@ {% set main_title = 'Neues Jahr, neues Smartphone?
Hol dir jetzt einen richtig guten Browser. Firefox!'|safe %} {% set main_tagline = 'Firefox blockierst du ganz einfach Tracker, verwaltest spielend deine Passwörter und passt deine Datenschutzeinstellungen mit wenigen Klicks an.' %} {% set qr_caption = 'Um loszulegen, scanne den QR-Code' %} - {% set qr_alt = 'QR-Code zum Scannen für Firefox' %} + {% set qr_campaign = 'firefox-welcome-17-de' %} {% set android_url = play_store_url('firefox', 'firefox-welcome-17b-de') %} {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b-de') %} {% elif LANG == "fr" %} @@ -31,7 +31,7 @@ {% set main_title = 'Nouvelle année, nouveau téléphone ?
Téléchargez l’application Firefox.'|safe %} {% set main_tagline = 'Bloquez les traqueurs, gérez vos mots de passe et personnalisez simplement vos paramètres de confidentialité avec Firefox, où que vous soyez.' %} {% set qr_caption = 'Scanner le code QR pour commencer' %} - {% set qr_alt = 'Code QR à scanner pour Firefox' %} + {% set qr_campaign = 'firefox-welcome-17-fr' %} {% set android_url = play_store_url('firefox', 'firefox-welcome-17b-fr') %} {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b-fr') %} {% else %} @@ -39,7 +39,7 @@ {% set main_title = 'New year, new phone?
Get the Firefox app.'|safe %} {% set main_tagline = 'Block trackers, manage passwords and easily customize your privacy settings with Firefox on-the-go.' %} {% set qr_caption = 'Scan the QR code to get started' %} - {% set qr_alt = 'QR code to scan for Firefox' %} + {% set qr_campaign = 'firefox-welcome-17-en' %} {% set android_url = play_store_url('firefox', 'firefox-welcome-17b') %} {% set ios_url = app_store_url('firefox', 'firefox-welcome-17b') %} {% endif %} @@ -80,7 +80,7 @@

{{ main_title }}

{{ main_tagline }}

- {{ qr_alt }} + {{ qrcode('https://www.mozilla.org/firefox/browsers/mobile/app/?product=firefox&campaign=' + qr_campaign, 12) }}
{{ qr_caption }}
diff --git a/bedrock/firefox/templates/firefox/welcome/page4.html b/bedrock/firefox/templates/firefox/welcome/page4.html index e4f0a39fa15..1ca039e6872 100644 --- a/bedrock/firefox/templates/firefox/welcome/page4.html +++ b/bedrock/firefox/templates/firefox/welcome/page4.html @@ -46,7 +46,7 @@

{{ ftl('welcome-page4-get-firefox-on-your-phone') }}

{% else %}

{{ ftl('welcome-page4-download-firefox-for-your') }}

-
{% endif %} diff --git a/bedrock/firefox/templates/firefox/welcome/page6.html b/bedrock/firefox/templates/firefox/welcome/page6.html index 77c835f954c..4e738ad7ebe 100644 --- a/bedrock/firefox/templates/firefox/welcome/page6.html +++ b/bedrock/firefox/templates/firefox/welcome/page6.html @@ -54,7 +54,7 @@

{{ ftl('welcome-page6-get-firefox-on-your-phone') }}

{{ ftl('welcome-page6-scan-the-qr-code-to-get-started') }}

- {{ ftl('welcome-page6-qr-code-to-scan-for-firefox') }} diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/laptop.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/laptop.svg deleted file mode 100644 index fc6224154d7..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/laptop.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/mobile.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/mobile.svg deleted file mode 100644 index fdc982bf87f..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/mobile.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/vpn-header.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/vpn-header.svg deleted file mode 100644 index 914df3e2236..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu-vpn/vpn-header.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-de.html b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-de.html deleted file mode 100644 index 54b10e5cdad..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-de.html +++ /dev/null @@ -1,24 +0,0 @@ -{# - 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/. -#} - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-fr.html b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-fr.html deleted file mode 100644 index 5e5f05fe3d2..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-fr.html +++ /dev/null @@ -1,22 +0,0 @@ -{# - 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/. -#} - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-uk.html b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-uk.html deleted file mode 100644 index c0ebe404479..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115-eu/qr-uk.html +++ /dev/null @@ -1,22 +0,0 @@ -{# - 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/. -#} - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115/addons.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx115/addons.svg deleted file mode 100644 index b5328c2b92f..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx115/addons.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-blue.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-blue.svg deleted file mode 100644 index 528a9d10878..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-blue.svg +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-white.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-white.svg deleted file mode 100644 index a22c203b531..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/arrow-white.svg +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/translate-icon.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/translate-icon.svg deleted file mode 100644 index 9c68aeed583..00000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx118/translate-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/bedrock/firefox/templates/firefox/whatsnew/index-account.html b/bedrock/firefox/templates/firefox/whatsnew/index-account.html index 80cecb6b9a0..ecce6da6942 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/index-account.html +++ b/bedrock/firefox/templates/firefox/whatsnew/index-account.html @@ -66,7 +66,7 @@

{{ ftl('whatsnew-account-signed-in-qr-title') }}

{% else %}
- {{ ftl('whatsnew-account-qr-code-alt') }} + {{ ftl('whatsnew-account-qr-code-alt') }}
{% endif %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/index.html b/bedrock/firefox/templates/firefox/whatsnew/index.html index d8bb382e425..0e4b5b12a9c 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/index.html +++ b/bedrock/firefox/templates/firefox/whatsnew/index.html @@ -50,7 +50,7 @@

{{ ftl('whatsnew-s2d-download-firefox-for-your') }} {% else %}
- +
{% endif %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx120-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx120-na.html index dd456be8bb6..30a5dba4b37 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx120-na.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx120-na.html @@ -19,23 +19,11 @@ {{ css_bundle('firefox_whatsnew_120_na') }} {% endblock %} -{% block experiments %} - {% if switch('experiment-firefox-whatsnew-120-na', ['en-US', 'en-CA']) %} - {{ js_bundle('firefox_whatsnew_120_experiment_na') }} - {% endif %} -{% endblock %} - {% block site_header %}{% endblock %} -{% if variant == '1' %} - {% set qr_code = static('img/firefox/whatsnew/whatsnew120-na/qr-video.png') %} - {% set install_fakespot_url = 'https://addons.mozilla.org/en-US/firefox/addon/fakespot-fake-reviews-amazon/?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-video&utm_content=Fakespot'%} - {% set sync_tabs_url = 'https://support.mozilla.org/en-US/kb/send-tab-firefox-desktop-other-devices?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-video&utm_content=Firefox'%} -{% else %} - {% set qr_code = static('img/firefox/whatsnew/whatsnew120-na/qr-novideo.png') %} - {% set install_fakespot_url = 'https://addons.mozilla.org/en-US/firefox/addon/fakespot-fake-reviews-amazon/?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-nonvideo&utm_content=Fakespot'%} - {% set sync_tabs_url = 'https://support.mozilla.org/en-US/kb/send-tab-firefox-desktop-other-devices?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-nonvideo&utm_content=Firefox'%} -{% endif %} +{% set qr_code = static('img/firefox/whatsnew/whatsnew120-na/qr-novideo.png') %} +{% set install_fakespot_url = 'https://addons.mozilla.org/en-US/firefox/addon/fakespot-fake-reviews-amazon/?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-nonvideo&utm_content=Fakespot'%} +{% set sync_tabs_url = 'https://support.mozilla.org/en-US/kb/send-tab-firefox-desktop-other-devices?utm_medium=referral&utm_source=www.mozilla.org-whatsnew&utm_campaign=whatsnew-120-na-nonvideo&utm_content=Firefox'%} {% block wnp_content %}
@@ -104,7 +92,7 @@

Make holiday shopping a breeze with Firefox

{% include 'firefox/whatsnew/includes/fx120/qr.svg' %}Get Firefox for mobile
- + {{ qrcode('https://www.mozilla.org/firefox/browsers/mobile/app/?product=firefox&campaign=firefox-whatsnew-120', 13) }}

Scan QR code to get Firefox on your phone

{% endcall %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx121.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx121.html index 5262d6f054f..ce2a20ff686 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx121.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx121.html @@ -99,7 +99,7 @@

{{ headline }}

{{ body }}

- {{ qr_code_alt_text }} + {{ qr_code_alt_text }} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html index cb3929b51c8..687407bb6a9 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx122-eu.html @@ -119,7 +119,7 @@

{{ ftl('whatsnew-s2d-want-privacy-on-every-device') }

{{ ftl('whatsnew-s2d-you-got-it-get-firefox-for') }}

- {{ ftl('whatsnew-account-qr-code-alt') }} + {{ ftl('whatsnew-account-qr-code-alt') }}

diff --git a/docs/redirects.rst b/docs/redirects.rst index 1448d582068..442ca395555 100644 --- a/docs/redirects.rst +++ b/docs/redirects.rst @@ -195,3 +195,30 @@ against a remote instance of the site (e.g. production) it will run a lot quicker by running the tests in parallel. To do this, you can add ``-n auto`` to the command line. Replace ``auto`` with an integer if you want to set the maximum number of concurrent processes. + +Mobile app store redirects +-------------------------- + +Occasionally we need to create a link that can auto redirect to either the Apple +App Store or the Google Play Store depending on user agent. A common use case is +to embed inside a QR Code, which people can then scan on their phone to get a +shortcut to the app. To make this easier bedrock has a special redirect URL to +which you can add product and campaign query strings. When someone hits the +redirect URL, bedrock will attempt to detect their mobile platform and then auto +redirect to the appropriate app store. + +The base redirect URL is ``https://www.mozilla.org/firefox/browsers/mobile/app/``, +and to it you can add both a ``product`` and ``campaign`` query parameter. For +example, the following URL would redirect to either Firefox on the Apple App Store +or on the Google Play Store, with the specified campaign parameter. + +.. code_block:: + + https://www.mozilla.org/firefox/browsers/mobile/app/?product=firefox&campaign=firefox-whatsnew + +.. note:: + + The ``product`` and ``campaign`` parameters are limited to a set of strictly + trusted values. To add more product and campaign options, you can add those + values to the ``mobile_app`` helper function in + `firefox/redirects.py `_. diff --git a/media/img/firefox/browsers/mobile/qr-firefox.png b/media/img/firefox/browsers/mobile/qr-firefox.png deleted file mode 100644 index 19fa186eb68..00000000000 Binary files a/media/img/firefox/browsers/mobile/qr-firefox.png and /dev/null differ diff --git a/media/img/firefox/browsers/mobile/qr-focus.png b/media/img/firefox/browsers/mobile/qr-focus.png deleted file mode 100644 index d063f00cae9..00000000000 Binary files a/media/img/firefox/browsers/mobile/qr-focus.png and /dev/null differ diff --git a/media/img/firefox/browsers/mobile/qr-klar.png b/media/img/firefox/browsers/mobile/qr-klar.png deleted file mode 100644 index c0442c53190..00000000000 Binary files a/media/img/firefox/browsers/mobile/qr-klar.png and /dev/null differ diff --git a/media/img/firefox/browsers/mobile/qr-variation.svg b/media/img/firefox/browsers/mobile/qr-variation.svg deleted file mode 100644 index fdd8977304a..00000000000 --- a/media/img/firefox/browsers/mobile/qr-variation.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-android.png b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-android.png new file mode 100644 index 00000000000..b1b9cdf9509 Binary files /dev/null and b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-android.png differ diff --git a/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-focus.png b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-focus.png new file mode 100644 index 00000000000..437d42375d3 Binary files /dev/null and b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-focus.png differ diff --git a/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-get-app.png b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-get-app.png new file mode 100644 index 00000000000..537da8ec0f3 Binary files /dev/null and b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-get-app.png differ diff --git a/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-ios.png b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-ios.png new file mode 100644 index 00000000000..873f5c1ba2c Binary files /dev/null and b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-ios.png differ diff --git a/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-klar.png b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-klar.png new file mode 100644 index 00000000000..8e3b5658fbe Binary files /dev/null and b/media/img/firefox/browsers/mobile/qrcode-firefox-browsers-mobile-klar.png differ diff --git a/media/img/firefox/welcome/qrcode-firefox-welcome-4.png b/media/img/firefox/welcome/qrcode-firefox-welcome-4.png new file mode 100644 index 00000000000..2e4e8630036 Binary files /dev/null and b/media/img/firefox/welcome/qrcode-firefox-welcome-4.png differ diff --git a/media/img/firefox/welcome/qrcode-firefox-welcome-6.png b/media/img/firefox/welcome/qrcode-firefox-welcome-6.png new file mode 100644 index 00000000000..d14267f43d1 Binary files /dev/null and b/media/img/firefox/welcome/qrcode-firefox-welcome-6.png differ diff --git a/media/img/firefox/welcome/welcome-qr-firefox.png b/media/img/firefox/welcome/welcome-qr-firefox.png deleted file mode 100644 index 96dc9e4dfc5..00000000000 Binary files a/media/img/firefox/welcome/welcome-qr-firefox.png and /dev/null differ diff --git a/media/img/firefox/welcome/welcome-qr-lockwise.png b/media/img/firefox/welcome/welcome-qr-lockwise.png deleted file mode 100644 index 4c31f592da8..00000000000 Binary files a/media/img/firefox/welcome/welcome-qr-lockwise.png and /dev/null differ diff --git a/media/img/firefox/whatsnew/qrcode-firefox-whatsnew.png b/media/img/firefox/whatsnew/qrcode-firefox-whatsnew.png new file mode 100644 index 00000000000..c9b986ed3e9 Binary files /dev/null and b/media/img/firefox/whatsnew/qrcode-firefox-whatsnew.png differ diff --git a/media/img/firefox/whatsnew/qrcode-fxa.png b/media/img/firefox/whatsnew/qrcode-fxa.png deleted file mode 100644 index 18b8be3579b..00000000000 Binary files a/media/img/firefox/whatsnew/qrcode-fxa.png and /dev/null differ diff --git a/media/img/firefox/whatsnew/qrcode.png b/media/img/firefox/whatsnew/qrcode.png deleted file mode 100644 index bcc3165ca6f..00000000000 Binary files a/media/img/firefox/whatsnew/qrcode.png and /dev/null differ diff --git a/media/img/firefox/whatsnew/whatsnew120-na/qr-code.svg b/media/img/firefox/whatsnew/whatsnew120-na/qr-code.svg deleted file mode 100644 index bbd152cbef1..00000000000 --- a/media/img/firefox/whatsnew/whatsnew120-na/qr-code.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/whatsnew/whatsnew120-na/qr-novideo.png b/media/img/firefox/whatsnew/whatsnew120-na/qr-novideo.png deleted file mode 100644 index f3228fe8dcc..00000000000 Binary files a/media/img/firefox/whatsnew/whatsnew120-na/qr-novideo.png and /dev/null differ diff --git a/media/img/firefox/whatsnew/whatsnew120-na/qr-video.png b/media/img/firefox/whatsnew/whatsnew120-na/qr-video.png deleted file mode 100644 index 5c5495ad443..00000000000 Binary files a/media/img/firefox/whatsnew/whatsnew120-na/qr-video.png and /dev/null differ diff --git a/media/img/firefox/whatsnew/whatsnew122/qrcode-firefox-whatsnew-122.png b/media/img/firefox/whatsnew/whatsnew122/qrcode-firefox-whatsnew-122.png new file mode 100644 index 00000000000..0ce1ec518be Binary files /dev/null and b/media/img/firefox/whatsnew/whatsnew122/qrcode-firefox-whatsnew-122.png differ diff --git a/media/img/l10n/de/firefox/welcome/page17/qr-code.png b/media/img/l10n/de/firefox/welcome/page17/qr-code.png deleted file mode 100644 index ef6ac7a617c..00000000000 Binary files a/media/img/l10n/de/firefox/welcome/page17/qr-code.png and /dev/null differ diff --git a/media/img/l10n/de/firefox/wnp-121/presents-and-qr.svg b/media/img/l10n/de/firefox/wnp-121/presents-and-qr.svg deleted file mode 100644 index ebdbe1d12a8..00000000000 --- a/media/img/l10n/de/firefox/wnp-121/presents-and-qr.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/l10n/de/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg b/media/img/l10n/de/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg new file mode 100644 index 00000000000..6f760c28d71 --- /dev/null +++ b/media/img/l10n/de/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg @@ -0,0 +1 @@ + diff --git a/media/img/l10n/en-GB/firefox/wnp-121/presents-and-qr.svg b/media/img/l10n/en-GB/firefox/wnp-121/presents-and-qr.svg deleted file mode 100644 index 65a741f6a9b..00000000000 --- a/media/img/l10n/en-GB/firefox/wnp-121/presents-and-qr.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/l10n/en-GB/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg b/media/img/l10n/en-GB/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg new file mode 100644 index 00000000000..f8ec1029141 --- /dev/null +++ b/media/img/l10n/en-GB/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg @@ -0,0 +1 @@ + diff --git a/media/img/l10n/en-US/firefox/welcome/page17/qr-code.png b/media/img/l10n/en-US/firefox/welcome/page17/qr-code.png deleted file mode 100644 index 6f3c7961e5c..00000000000 Binary files a/media/img/l10n/en-US/firefox/welcome/page17/qr-code.png and /dev/null differ diff --git a/media/img/l10n/en-US/firefox/wnp-121/presents-and-qr.svg b/media/img/l10n/en-US/firefox/wnp-121/presents-and-qr.svg deleted file mode 100644 index c63eff9969d..00000000000 --- a/media/img/l10n/en-US/firefox/wnp-121/presents-and-qr.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/l10n/en-US/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg b/media/img/l10n/en-US/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg new file mode 100644 index 00000000000..d400b8192df --- /dev/null +++ b/media/img/l10n/en-US/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg @@ -0,0 +1 @@ + diff --git a/media/img/l10n/fr/firefox/welcome/page17/qr-code.png b/media/img/l10n/fr/firefox/welcome/page17/qr-code.png deleted file mode 100644 index 3549b248480..00000000000 Binary files a/media/img/l10n/fr/firefox/welcome/page17/qr-code.png and /dev/null differ diff --git a/media/img/l10n/fr/firefox/wnp-121/presents-and-qr.svg b/media/img/l10n/fr/firefox/wnp-121/presents-and-qr.svg deleted file mode 100644 index 568d4a0258b..00000000000 --- a/media/img/l10n/fr/firefox/wnp-121/presents-and-qr.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/l10n/fr/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg b/media/img/l10n/fr/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg new file mode 100644 index 00000000000..79e8fad48fd --- /dev/null +++ b/media/img/l10n/fr/firefox/wnp-121/qrcode-firefox-whatsnew-121.svg @@ -0,0 +1 @@ + diff --git a/media/js/firefox/whatsnew/whatsnew-120-experiment-na.es6.js b/media/js/firefox/whatsnew/whatsnew-120-experiment-na.es6.js deleted file mode 100644 index 1e690ff6490..00000000000 --- a/media/js/firefox/whatsnew/whatsnew-120-experiment-na.es6.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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/. - */ - -import TrafficCop from '@mozmeao/trafficcop'; -import { isApprovedToRun } from '../../base/experiment-utils.es6.js'; - -const href = window.location.href; - -const initTrafficCop = () => { - if (href.indexOf('v=') !== -1) { - if (href.indexOf('v=1') !== -1) { - // UA - window.dataLayer.push({ - 'data-ex-variant': 'wnp120-video', - 'data-ex-name': 'wnp-120-experiment-na' - }); - // GA4 - window.dataLayer.push({ - event: 'experiment_view', - id: 'wnp-120-experiment-na', - variant: 'wnp120-video' - }); - } else if (href.indexOf('v=2') !== -1) { - // UA - window.dataLayer.push({ - 'data-ex-variant': 'wnp120-no-video', - 'data-ex-name': 'wnp-120-experiment-na' - }); - // GA4 - window.dataLayer.push({ - event: 'experiment_view', - id: 'wnp-120-experiment-na', - variant: 'wnp120-no-video' - }); - } - } else if (TrafficCop) { - const murtaugh = new TrafficCop({ - id: 'wnp-120-expiriment-na', - cookieExpires: 0, - variations: { - 'v=1': 0, // Fakespot video - 'v=2': 100 // no video - } - }); - murtaugh.init(); - } -}; - -// Avoid entering automated tests into random experiments. -if (isApprovedToRun()) { - initTrafficCop(); -} diff --git a/media/static-bundles.json b/media/static-bundles.json index 7dedaaf92b0..bcc2fecc09d 100644 --- a/media/static-bundles.json +++ b/media/static-bundles.json @@ -1603,12 +1603,6 @@ ], "name": "firefox_whatsnew_120_na" }, - { - "files": [ - "js/firefox/whatsnew/whatsnew-120-experiment-na.es6.js" - ], - "name": "firefox_whatsnew_120_experiment_na" - }, { "files": [ "js/firefox/whatsnew/whatsnew-120-eu.es6.js"