From 17e6aabd034c4bb52406b5df56b61838713bf530 Mon Sep 17 00:00:00 2001 From: Stephanie Hobson Date: Mon, 29 Jul 2024 20:26:59 -0700 Subject: [PATCH 1/2] Update analytics documentation, and reflect docs in code Update analytics documentation to remove UA and edit the code to make it match the GA4 docs. - Re-write analytics documentation intro - Remove: UA documentation - Remove: UA dataLayer pushes - Remove: data-link-group (migrate into data-link-position where appropriate) - Remove: data-cta-type="button" - Remove: data-cta-type="link" - data-cta and data-link should not be used on the same attribute --- .../protocol/footer/footer-refresh.html | 60 +-- .../includes/protocol/footer/footer.html | 76 +-- .../navigation/menus-refresh/about-us.html | 12 +- .../navigation/menus-refresh/firefox.html | 10 +- .../navigation/menus-refresh/products.html | 16 +- .../protocol/navigation/menus/firefox.html | 16 +- .../protocol/navigation/menus/innovation.html | 8 +- .../protocol/navigation/menus/products.html | 16 +- .../protocol/navigation/menus/whoweare.html | 16 +- .../includes/protocol/navigation/nav-cta.html | 2 +- .../navigation/navigation-refresh.html | 2 +- .../protocol/navigation/navigation.html | 2 +- bedrock/base/templates/macros-protocol.html | 4 +- bedrock/base/templates/macros.html | 3 +- bedrock/base/tests/test_macros.py | 6 +- .../careers/templates/careers/benefits.html | 2 +- bedrock/careers/templates/careers/home.html | 10 +- .../careers/templates/careers/locations.html | 2 +- bedrock/careers/templates/careers/teams.html | 2 +- bedrock/contentful/api.py | 2 +- .../templates/includes/contentful/cta.html | 10 +- bedrock/contentful/tests/data.py | 2 +- .../contentful/tests/test_contentful_api.py | 9 +- .../firefox/browsers/chromebook.html | 2 +- .../firefox/browsers/compare/brave.html | 4 +- .../firefox/browsers/compare/edge.html | 4 +- .../firefox/browsers/compare/index.html | 2 +- .../firefox/browsers/compare/opera.html | 4 +- .../firefox/browsers/compare/safari.html | 4 +- .../firefox/browsers/mobile/index.html | 14 +- .../challenge-the-default/landing-base.html | 6 +- .../templates/firefox/channel/desktop.html | 4 +- .../templates/firefox/developer/index.html | 2 +- .../firefox/developer/whatsnew-mdnplus.html | 4 +- .../firefox/family/includes/agreement.html | 2 +- .../family/includes/download-firefox.html | 4 +- .../firefox/family/includes/modules/faq.html | 32 +- .../firefox/family/includes/resources.html | 2 +- .../firefox/features/includes/subnav.html | 31 ++ .../templates/firefox/features/index.html | 2 +- .../templates/firefox/features/translate.html | 2 +- .../templates/firefox/includes/macros.html | 2 +- bedrock/firefox/templates/firefox/index.html | 16 +- .../templates/firefox/new/basic/thanks.html | 6 +- .../firefox/new/desktop/download.html | 24 +- .../templates/firefox/new/desktop/thanks.html | 12 +- .../templates/firefox/nightly/firstrun.html | 6 +- .../templates/firefox/nightly/whatsnew.html | 2 +- .../firefox/nothing-personal/index.html | 4 +- bedrock/firefox/templates/firefox/pocket.html | 4 +- .../firefox/set-as-default/landing.html | 2 +- bedrock/firefox/templates/firefox/switch.html | 6 +- .../templates/firefox/welcome/page1.html | 2 +- .../templates/firefox/welcome/page10.html | 2 +- .../templates/firefox/welcome/page11.html | 2 +- .../templates/firefox/welcome/page12.html | 2 +- .../templates/firefox/welcome/page13.html | 2 +- .../templates/firefox/welcome/page14.html | 2 +- .../templates/firefox/welcome/page16.html | 2 +- .../firefox/welcome/page17/page17-a.html | 2 +- .../firefox/welcome/page17/page17-c.html | 2 +- .../templates/firefox/welcome/page18.html | 4 +- .../templates/firefox/welcome/page2.html | 4 +- .../templates/firefox/welcome/page4.html | 2 +- .../templates/firefox/welcome/page6.html | 2 +- .../templates/firefox/welcome/page8.html | 10 +- .../templates/firefox/welcome/page9.de.html | 2 +- .../templates/firefox/welcome/page9.fr.html | 2 +- .../whatsnew/includes/mofo-donate-cta.html | 2 +- .../firefox/whatsnew/whatsnew-fx125-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx125-na.html | 4 +- .../firefox/whatsnew/whatsnew-fx126-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx126-na.html | 2 +- .../whatsnew/whatsnew-fx126beta-de.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-CA.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-GB.html | 2 +- .../whatsnew/whatsnew-fx126beta-en-US.html | 2 +- .../whatsnew/whatsnew-fx126beta-fr.html | 2 +- .../firefox/whatsnew/whatsnew-fx127-eu.html | 2 +- .../firefox/whatsnew/whatsnew-fx127-na.html | 2 +- .../whatsnew/whatsnew-fx128-eu-addons.html | 2 +- .../whatsnew/whatsnew-fx128-eu-donate.html | 2 +- .../firefox/whatsnew/whatsnew-fx128-na.html | 2 +- .../firefox/whatsnew/whatsnew-fx129-na.html | 4 +- .../2021/includes/modal-blog.html | 18 +- .../foundation/annualreport/2021/index.html | 26 +- .../mozorg/templates/mozorg/about/index.html | 4 +- .../templates/mozorg/about/manifesto.html | 4 +- .../templates/mozorg/antiharassment-tool.html | 2 +- .../templates/mozorg/home/home-new.html | 16 +- .../mozorg/home/includes/ctd-promo-de.html | 4 +- .../mozorg/home/includes/featured-vpn.html | 2 +- .../home/includes/mofo-donate-promo.html | 2 +- .../includes/mozilla-account-promo.html | 2 +- bedrock/mozorg/tests/test_helper_misc.py | 4 +- .../templates/newsletter/includes/form.html | 2 +- .../newsletter/opt-out-confirmation.html | 8 +- bedrock/newsletter/tests/test_views.py | 4 +- .../pocket/firefox/new-tab-learn-more.html | 2 +- bedrock/pocket/templates/pocket/home.html | 2 +- .../templates/pocket/pocket-and-firefox.html | 4 +- .../products/templates/products/landing.html | 34 +- .../templates/products/mozsocial/invite.html | 106 ++++ .../templates/products/vpn/download.html | 22 +- .../templates/products/vpn/features.html | 16 +- .../products/vpn/includes/macros.html | 20 +- .../templates/products/vpn/invite.html | 2 +- .../products/vpn/landing-refresh.html | 6 +- .../templates/products/vpn/landing.html | 360 +++++++++++++ .../products/vpn/pricing-refresh.html | 8 +- .../templates/products/vpn/pricing.html | 90 ++++ .../vpn/resource-center/base-article.html | 4 +- bedrock/products/tests/test_helper_misc.py | 12 +- docs/abtest.rst | 40 +- docs/attribution/0001-analytics.rst | 484 +++++++----------- docs/attribution/0002-firefox-desktop.rst | 2 + docs/attribution/0004-mozilla-accounts.rst | 2 +- docs/l10n.rst | 2 +- docs/mozilla-accounts.rst | 2 +- media/js/base/banners/mozilla-banner.es6.js | 7 - .../base/protocol/init-lang-switcher.es6.js | 6 - media/js/base/send-to-device.es6.js | 6 - media/js/firefox/all/all-init.es6.js | 6 - .../challenge-the-default.es6.js | 28 - media/js/firefox/family/banner.es6.js | 7 - .../firefox/new/common/thanks-direct.es6.js | 12 - media/js/firefox/new/desktop/download.js | 6 - media/js/firefox/set-as-default/thanks.js | 15 - media/js/firefox/share-page.es6.js | 7 - media/js/firefox/welcome/welcome6.es6.js | 6 - media/js/firefox/welcome/welcome8.js | 12 - media/js/firefox/whatsnew/whatsnew-125-eu.js | 28 - media/js/firefox/whatsnew/whatsnew-125-na.js | 28 - media/js/firefox/whatsnew/whatsnew-126.js | 28 - media/js/firefox/whatsnew/whatsnew-126beta.js | 28 - media/js/firefox/whatsnew/whatsnew-127-eu.js | 28 - media/js/firefox/whatsnew/whatsnew-127-na.js | 28 - media/js/newsletter/newsletter-init.es6.js | 5 - .../vpn/resource-center-article.es6.js | 6 - tests/unit/spec/products/vpn/invite.js | 2 +- 140 files changed, 1181 insertions(+), 1013 deletions(-) create mode 100644 bedrock/firefox/templates/firefox/features/includes/subnav.html create mode 100644 bedrock/products/templates/products/mozsocial/invite.html create mode 100644 bedrock/products/templates/products/vpn/landing.html create mode 100644 bedrock/products/templates/products/vpn/pricing.html diff --git a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html index 8e137de5ee9..4a67152b192 100644 --- a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html +++ b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html @@ -17,19 +17,19 @@

{{ ftl('footer-refresh-follow-mozilla') }}

{{ ftl('footer-refresh-follow-firefox') }}

@@ -40,16 +40,16 @@

{{ ftl('footer-refresh-company') }}

@@ -59,9 +59,9 @@

{{ ftl('footer-refresh-support') }}

@@ -70,9 +70,9 @@

{{ ftl('footer-refresh-resources') }}

@@ -81,10 +81,10 @@

{{ ftl('footer-refresh-developers') }}

@@ -104,21 +104,21 @@