Skip to content

Commit

Permalink
Update analytics documentation, and reflect docs in code
Browse files Browse the repository at this point in the history
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
  • Loading branch information
stephaniehobson committed Aug 1, 2024
1 parent 6ec4adb commit 0149529
Show file tree
Hide file tree
Showing 141 changed files with 570 additions and 978 deletions.
2 changes: 1 addition & 1 deletion bedrock/base/templates/includes/banners/fundraiser.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
<h2 class="c-banner-title">{{ title }}</h2>
<p class="c-banner-tagline">{{ tagline }}</p>

<a class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="{{ donate_url }}" data-cta-type="button" data-cta-text="{{ button }}">{{ button }}</a>
<a class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="{{ donate_url }}" data-cta-text="Donate" data-cta-position="fundraising-banner">{{ button }}</a>
{% endcall %}
{% endblock %}
72 changes: 36 additions & 36 deletions bedrock/base/templates/includes/protocol/footer/footer.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ul class="mzp-l-rows-three">
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-type="nav" data-link-position="topnav" data-link-group="firefox" data-testid="navigation-menu-link-firefox-desktop">
<a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-position="topnav - firefox" data-testid="navigation-menu-link-firefox-desktop">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallback='navigation-firefox-browser-for-desktop') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-not-for-profit-backed', fallback='navigation-get-the-browser-that-respects') }}</p>
Expand All @@ -25,7 +25,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallba
{% if ftl_has_messages('navigation-v2-firefox-for-ios', 'navigation-v2-firefox-for-android') %}
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-position="topnav - firefox">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-customizable-mobile') }}</p>
Expand All @@ -34,7 +34,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-position="topnav - firefox">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-mobile-browser') }}</p>
Expand All @@ -44,7 +44,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
{% else %}
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.index') }}" data-link-text="Firefox for Mobile" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.index') }}" data-link-text="Firefox for Mobile" data-link-position="topnav - firefox">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-take-speed-privacy-and') }}</p>
Expand All @@ -54,7 +54,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}
{% endif %}
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-position="topnav - firefox">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/focus/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-focus') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-simply-private-mobile') }}</p>
Expand All @@ -63,7 +63,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-focus') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-position="topnav - firefox">
<svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M21.1 7.5c-.2-.2-.2-.5 0-.7l.5-.5c.8-.8 2.1-.8 2.9 0l1.2 1.2c.8.8.8 2.1 0 2.9l-.5.5c-.2.2-.5.2-.7 0l-3.4-3.4zm2.3 4.5c.2.2.2.5 0 .7L12.7 23.4c-.2.2-.4.3-.6.4l-5.7 2.4c-.3.1-.6 0-.7-.3-.1-.1-.1-.3 0-.4L8.1 20c.1-.2.3-.5.4-.6L19.2 8.6c.2-.2.5-.2.7 0l3.5 3.4zM11.5 22.7l-3.9 1.7 1.7-3.9c0-.1.1-.2.2-.2l2.3 2.3c-.1 0-.2.1-.3.1z"></path></svg>
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-blog') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-read-about-new-firefox-features', fallback='navigation-read-about-new-firefox') }}</p>
Expand All @@ -72,7 +72,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-blog') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-text="Release Notes" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
<a class="c-menu-item-link" href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-text="Release Notes" data-link-position="topnav - firefox">
<svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M2.7 23.6c0 2.4 2 4.4 4.4 4.4h5.6c1.4 0 2.3.5 3.3 1.5 1-1 2-1.5 3.3-1.5h5.6c2.4 0 4.4-2 4.4-4.4V8.4c0-2.4-2-4.4-4.4-4.4h-5.6C18 4 17 4.2 16 5.2c-1-1-2-1.2-3.3-1.2H7.1C4.6 4 2.7 6 2.7 8.4v15.2zm24 0c0 1-.8 1.7-1.7 1.7h-5.6c-1.3 0-2.3.2-3.3 1.2-1-1-2-1.2-3.3-1.2H7.1c-1 0-1.7-.8-1.7-1.7V8.4c0-1 .8-1.7 1.7-1.7h5.6c1.3 0 2.3.5 3.3 1.5 1-1 2-1.5 3.3-1.5h5.6c1 0 1.7.8 1.7 1.7v15.2zM13.3 10.7H8c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7h5.3c.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-5.3 4h5.3c.4 0 .7-.3.7-.7s-.3-.7-.7-.7H8c-.4 0-.7.3-.7.7s.3.7.7.7zm5.3 4H8c-.4 0-.7-.3-.7-.7s.3-.7.7-.7h5.3c.4 0 .7.3.7.7s-.3.7-.7.7zm-5.3 4h3.4c.4 0 .7-.3.7-.7s-.3-.7-.7-.7H8c-.4 0-.7.3-.7.7s.3.7.7.7z"></path></svg>
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-release-notes', fallback='navigation-release-notes') }}</h4>
{% if ftl_has_messages('navigation-v2-get-the-details-on-the') %}
Expand All @@ -82,7 +82,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-release-notes', fallback='na
</section>
</li>
</ul>
<p class="c-menu-category-link"><a href="{{ url('firefox') }}" data-link-text="View all Firefox Browsers" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">{{ ftl('navigation-v2-view-all-firefox-browsers') }}</a></p>
<p class="c-menu-category-link"><a href="{{ url('firefox') }}" data-link-text="View all Firefox Browsers" data-link-position="topnav - firefox">{{ ftl('navigation-v2-view-all-firefox-browsers') }}</a></p>
</div>
</div><!-- close .c-menu-panel-container -->
</div><!-- close .c-menu-panel -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ul class="mzp-l-rows-two">
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('firefox.developer.index') }}" data-link-text="Firefox Developer Edition" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
<a class="c-menu-item-link" href="{{ url('firefox.developer.index') }}" data-link-text="Firefox Developer Edition" data-link-position="topnav - innovation">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/developer/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-developer-edition', fallback='navigation-firefox-developer-edition') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-firefox-browser-built', fallback='navigation-firefox-built-just-for') }}</p>
Expand All @@ -24,7 +24,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-developer-edition',
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://developer.mozilla.org/?{{ utm_params }}" data-link-text="MDN Web Docs" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
<a class="c-menu-item-link" href="https://developer.mozilla.org/?{{ utm_params }}" data-link-text="MDN Web Docs" data-link-position="topnav - innovation">
<img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-mdn-web-docs.svg') }}" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-web-docs') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-check-out-the-home-for-web', fallback='navigation-resources-for-developers') }}</p>
Expand All @@ -33,7 +33,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-web-docs') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
<a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-position="topnav - innovation">
<img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-innovation-projects.svg') }}" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-innovation-projects') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-discover-ways-to-bring') }}</p>
Expand All @@ -42,7 +42,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-innovation-projects'
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://commonvoice.mozilla.org/?{{ utm_params }}" data-link-text="Common Voice" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
<a class="c-menu-item-link" href="https://commonvoice.mozilla.org/?{{ utm_params }}" data-link-text="Common Voice" data-link-position="topnav - innovation">
<img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-common-voice.svg') }}" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-common-voice') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-donate-your-voice-so-the-future', fallback='navigation-donate-your-voice-to') }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ul class="mzp-l-rows-four">
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-type="nav" data-link-position="topnav" data-link-group="products">
<a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-position="topnav - products">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-monitor') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-see-if-your-email-has', fallback='navigation-see-if-your-personal') }}</p>
Expand All @@ -24,7 +24,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-monitor') }}</h4>
</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-type="nav" data-link-position="topnav" data-link-group="products">
<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>
Expand All @@ -33,7 +33,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-facebook-container') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-type="nav" data-link-position="topnav" data-link-group="products">
<a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-position="topnav - products">
<img loading="lazy" src="{{ static('protocol/img/logos/pocket/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-pocket') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-save-and-discover-the-best', fallback='navigation-save-quality-content') }}</p>
Expand All @@ -42,7 +42,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-pocket') }}</h4>
</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-type="nav" data-link-position="topnav" data-link-group="products">
<a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-position="topnav - products">
<img loading="lazy" src="{{ static('protocol/img/logos/mozilla/vpn/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-vpn') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-get-protection-beyond-your-browser', fallback='navigation-protect-your-entire-device') }}</p>
Expand All @@ -51,7 +51,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-vpn') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
<a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-position="topnav - projects">
<img loading="lazy" src="{{ static('protocol/img/logos/firefox/relay/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-relay', fallback='navigation-v2-firefox-relay-beta') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-sign-up-for-new-accounts') }}</p>
Expand All @@ -60,7 +60,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-relay', fallback='na
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
<a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-position="topnav - projects">
<img loading="lazy" src="{{ static('img/nav/icons/icon-mdn-plus.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-plus') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-new-features-and-tools') }}</p>
Expand All @@ -69,7 +69,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-plus') }}</h4>
</li>
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
<a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-position="topnav - projects">
<img loading="lazy" src="{{ static('img/logos/fakespot/logo-blue.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-fakespot') }}</h4>
{% if ftl_has_messages('navigation-v2-use-ai-to-detect') %}
Expand All @@ -79,7 +79,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-fakespot') }}</h4>
</section>
</li>
</ul>
<p class="c-menu-category-link"><a href="{{ url('products.landing') }}" data-link-text="View all Products" data-link-type="nav" data-link-position="topnav" data-link-group="products">{{ ftl('navigation-v2-view-all-products') }}</a></p>
<p class="c-menu-category-link"><a href="{{ url('products.landing') }}" data-link-text="View all Products" data-link-position="topnav - products">{{ ftl('navigation-v2-view-all-products') }}</a></p>
</div>
</div><!-- close .c-menu-panel-container -->
</div><!-- close .c-menu-panel -->
Expand Down
Loading

0 comments on commit 0149529

Please sign in to comment.