Skip to content

Commit

Permalink
bug 1248040] Update GTM data attributes on Firefox navigation and dow…
Browse files Browse the repository at this point in the history 
…nloads, and on /firefox/android/ CTA and Google Play buttons
  • Loading branch information
James Lorence committed Mar 2, 2016
1 parent 2689fb6 commit 1896dd2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 38 deletions.
30 changes: 15 additions & 15 deletions bedrock/base/templates/macros.html
View file
Expand Up @@ -220,9 +220,9 @@ <h3>{{ cta_text }}</h3>
<a data-id="android" href="{{ url('firefox.android.index') }}" class="primary-link" data-link-type="nav" data-link-name="for Android"><div>{{ _('<span>for</span> Android') }}</div></a>

<ul class="subnav" id="android-subnav">
<li><a href="{{ url('firefox.android.index') }}"{% if activesub == 'index' %} class="selected"{% endif %}><div>{{ _('Overview') }}</div></a></li>
<li><a href="{{ url('firefox.sync') }}"{% if activesub == 'sync' %} class="selected"{% endif %}><div>{{ _('Sync') }}</div></a></li>
<li><a href="{{ url('firefox.private-browsing') }}"{% if activesub == 'private-browsing' %} class="selected"{% endif %}><div>{{ _('Private Browsing') }}</div></a></li>
<li><a href="{{ url('firefox.android.index') }}"{% if activesub == 'index' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Android: Overview"><div>{{ _('Overview') }}</div></a></li>
<li><a href="{{ url('firefox.sync') }}"{% if activesub == 'sync' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Android: Sync"><div>{{ _('Sync') }}</div></a></li>
<li><a href="{{ url('firefox.private-browsing') }}"{% if activesub == 'private-browsing' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Android: Private Browsing"><div>{{ _('Private Browsing') }}</div></a></li>
</ul>
</li>
<li{% if activeprimary == 'ios' %} class="active"{% endif %}>
Expand Down Expand Up @@ -254,19 +254,19 @@ <h3>{{ cta_text }}</h3>
<div class="triangle-border"></div>

<ul class="tertiarynav{% if activeprimary == 'desktop' %} active{% endif %}">
<li><a href="{{ url('firefox.dnt') }}" data-ga="desktop - dnt" data-link-type="nav" data-link-name="Side Menu: Do Not Track">{{ _('Do Not Track') }}</a></li>
<li><a href="{{ url('firefox.interest-dashboard') }}" data-ga="desktop - interest dashboard" data-link-type="nav" data-link-name="Side Menu: Interest Dashboard">{{ _('Interest Dashboard') }}</a></li>
<li><a href="{{ url('firefox.developer') }}" data-ga="desktop - developer edition" data-link-type="nav" data-link-name="Side Menu: Developer Edition">{{ _('Developer Edition') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/kb/private-browsing-browse-web-without-saving-info" data-ga="desktop - private browsing" data-link-type="nav" data-link-name="Side Menu: Private Browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org" data-ga="desktop - addons" data-link-type="nav" data-link-name="Side Menu: Add-ons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/firefox" data-ga="desktop - support" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
<li><a href="{{ url('firefox.dnt') }}" data-link-type="nav" data-link-name="Side Menu: Do Not Track">{{ _('Do Not Track') }}</a></li>
<li><a href="{{ url('firefox.interest-dashboard') }}" data-link-type="nav" data-link-name="Side Menu: Interest Dashboard">{{ _('Interest Dashboard') }}</a></li>
<li><a href="{{ url('firefox.developer') }}" data-link-type="nav" data-link-name="Side Menu: Developer Edition">{{ _('Developer Edition') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/kb/private-browsing-browse-web-without-saving-info" data-link-type="nav" data-link-name="Side Menu: Private Browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org" data-link-type="nav" data-link-name="Side Menu: Add-ons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/firefox" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
</ul>

<ul class="tertiarynav{% if activeprimary == 'android' %} active{% endif %}">
<li><a href="{{ url('firefox.dnt') }}" data-ga="android - dnt">{{ _('Do Not Track') }}</a></li>
<li><a rel="external" href="https://www.youtube.com/watch?v=Ewk0YtFTBec&amp;list=PLA8ABF6B7A66A0C5E&amp;index=15" data-ga="android - private browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org/android/" data-ga="android - addons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/mobile" data-ga="android - support">{{ _('Need help?') }}</a></li>
<li><a href="{{ url('firefox.dnt') }}" data-link-type="nav" data-link-name="Side Menu: Do Not Track">{{ _('Do Not Track') }}</a></li>
<li><a rel="external" href="https://www.youtube.com/watch?v=Ewk0YtFTBec&amp;list=PLA8ABF6B7A66A0C5E&amp;index=15" data-link-type="nav" data-link-name="Side Menu: Private Browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org/android/" data-link-type="nav" data-link-name="Side Menu: Android Add-ons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/mobile" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
</ul>

<ul class="tertiarynav{% if activeprimary == 'ios' %} active{% endif %}">
Expand Down Expand Up @@ -349,7 +349,7 @@ <h2 class="thank-you hidden">{{ _('Your download link was sent.') }}</h2>
<input id="id-input" name="phone-or-email" type="text" required>
</div>
<div class="form-submit">
<button type="submit" class="button-flat">{{ _('Send') }}</button>
<button type="submit" class="button-flat" data-download-os="Android">{{ _('Send') }}</button>
</div>
</div>
<p class="legal sms">
Expand Down Expand Up @@ -378,7 +378,7 @@ <h2 class="thank-you hidden">{{ _('Your download link was sent.') }}</h2>
<a class="more" href="{{ ios_link }}">{{ _('Go to the App Store')}}</a>
</li>
<li class="google-play">
<a class="more" href="{{ android_link }}">{{ _('Go to Google Play')}}</a>
<a class="more" href="{{ android_link }}" data-link-type="download" data-download-os="Android">{{ _('Go to Google Play')}}</a>
</li>
</ul>
</footer>
Expand Down
10 changes: 5 additions & 5 deletions bedrock/firefox/templates/firefox/android/index.html
View file
Expand Up @@ -34,10 +34,10 @@
{% block site_header_unwrapped %}
{% call fxfamilynav('android', 'index') %}
<div class="{% if has_widget %}show-widget{% endif %}">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-link-type="download" data-download-os="Android">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': _('Get it on Google Play'), 'width': '152', 'height': '45', 'l10n': True}) }}
</a>
<button class="send-to button-flat-dark" type="button">{{ _('Get Firefox for Android') }}</button>
<button class="send-to button-flat-dark" type="button" data-button-name="Get Firefox for Android">{{ _('Get Firefox for Android') }}</button>
</div>
{% endcall %}
{% endblock %}
Expand All @@ -61,7 +61,7 @@ <h2 class="heading">
<div class="{% if has_widget %}show-widget{% endif %}">
{{ send_to_device(platform='android', include_logo=False) }}

<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-button-type="download" data-interaction="download click" data-download-version="Firefox for Android">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-link-type="download" data-download-os="Android">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': _('Get it on Google Play'), 'width': '152', 'height': '45', 'l10n': True}) }}
</a>
<small class="download-other">
Expand Down Expand Up @@ -390,10 +390,10 @@ <h2 class="heading">{{ _('Don’t leave home without being in Sync') }}</h2>
<div id="download-content">
<h3>{{ _('Choose Firefox') }}</h3>
<div id="send-to-device-footer">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-button-type="download" data-interaction="button download click" data-download-version="Firefox for Android" data-alt="{{ _('Get Firefox for Android') }}">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-link-type="download" data-download-os="Android" data-alt="{{ _('Get Firefox for Android') }}">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': _('Get it on Google Play'), 'width': '152', 'height': '45', 'l10n': True}) }}
</a>
<button class="send-to button-flat-dark" type="button">{{ _('Get Firefox for Android') }}</button>
<button class="send-to button-flat-dark" type="button" data-button-name="Get Firefox for Android">{{ _('Get Firefox for Android') }}</button>
</div>
<ul>
<li>
Expand Down
18 changes: 0 additions & 18 deletions media/js/firefox/android.js
View file
Expand Up @@ -270,24 +270,6 @@
}
}

// track link on the primary CTA
$('#intro .dl-button').attr({
'data-interaction': 'download click',
'data-download-version': 'Firefox for Android'
});

// track link on the secondary CTA
$('#subscribe-download-wrapper .dl-button').attr({
'data-interaction': 'button download click',
'data-download-version': 'Firefox for Android'
});

// track links except the accordion
$('#privacy, #sync, #subscribe-download-wrapper ul').attr({
'data-interaction': 'link click',
'data-download-version': 'href'
});

if (hasWidget) {
sendToDeviceWidgetTop = $('#send-to-device').offset().top;
sendToDeviceWidget = new Mozilla.SendToDevice();
Expand Down

0 comments on commit 1896dd2

Please sign in to comment.