From d6b1eb4543817344685fa7b2dc89e2cca5dc9d9e Mon Sep 17 00:00:00 2001 From: James Lorence Date: Wed, 24 Feb 2016 16:28:39 -0800 Subject: [PATCH] [bug 1248040] Update GTM data attributes on homepage navigation and Firefox download buttons --- .../firefox/includes/download-button.html | 5 ++- .../mozorg/templates/mozorg/home/home.html | 12 +++--- .../mozorg/home/includes/upcoming-events.html | 2 +- bedrock/settings/static_media.py | 1 - media/js/mozorg/home/ga-tracking.js | 41 ------------------- tests/pages/base.py | 6 +-- 6 files changed, 14 insertions(+), 53 deletions(-) delete mode 100644 media/js/mozorg/home/ga-tracking.js diff --git a/bedrock/firefox/templates/firefox/includes/download-button.html b/bedrock/firefox/templates/firefox/includes/download-button.html index caaf28ab2fd..74d44ff5581 100644 --- a/bedrock/firefox/templates/firefox/includes/download-button.html +++ b/bedrock/firefox/templates/firefox/includes/download-button.html @@ -43,7 +43,10 @@
  • + data-direct-link="{{ plat.download_link_direct }}"{% endif %} + {% if plat.os == 'android' %}data-link-type="download" data-download-os="Android" + {% elif plat.os == 'ios' %}data-link-type="download" data-download-os="iOS" + {% else %}data-link-type="download" data-download-os="Desktop"{% endif %}> {% if plat.os == 'android' %} {% if channel == 'beta' %} diff --git a/bedrock/mozorg/templates/mozorg/home/home.html b/bedrock/mozorg/templates/mozorg/home/home.html index 78d18dfd71e..ad59b69e95b 100644 --- a/bedrock/mozorg/templates/mozorg/home/home.html +++ b/bedrock/mozorg/templates/mozorg/home/home.html @@ -79,7 +79,7 @@
    {% block tabzilla_tab %} {% endblock %} @@ -88,16 +88,16 @@ @@ -314,7 +314,7 @@

    {{_('Committed to you, your privacy and an open Web

    • - + {{ _('Get Involved with Mozilla today') }} diff --git a/bedrock/mozorg/templates/mozorg/home/includes/upcoming-events.html b/bedrock/mozorg/templates/mozorg/home/includes/upcoming-events.html index 78a740a1423..0dd68ee5155 100644 --- a/bedrock/mozorg/templates/mozorg/home/includes/upcoming-events.html +++ b/bedrock/mozorg/templates/mozorg/home/includes/upcoming-events.html @@ -50,7 +50,7 @@

    {{ event.title|safe }}

    {% endfor %} - {{ _('See all events') }} + {{ _('See all events') }} {% endif %} diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py index 8697eb32865..c6975de6263 100644 --- a/bedrock/settings/static_media.py +++ b/bedrock/settings/static_media.py @@ -1414,7 +1414,6 @@ 'home': { 'source_filenames': ( 'js/mozorg/home/home.js', - 'js/mozorg/home/ga-tracking.js', ), 'output_filename': 'js/home-bundle.js', }, diff --git a/media/js/mozorg/home/ga-tracking.js b/media/js/mozorg/home/ga-tracking.js deleted file mode 100644 index c976eec96ba..00000000000 --- a/media/js/mozorg/home/ga-tracking.js +++ /dev/null @@ -1,41 +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 http://mozilla.org/MPL/2.0/. */ - -$(function () { - 'use strict'; - - // track download firefox promo clicks - $('.promo-small-landscape.firefox-download a.download-link').each(function() { - var $this = $(this); - var $promo = $this.closest('.promo-small-landscape'); - var isAndroid = $promo.find('li.os_android:visible').length > 0; - var type = isAndroid ? 'Firefox Android' : 'Firefox Desktop'; - var tilePosition = $promo.prop('id'); - var tileSize = 'promo-small-landscape'; - - $this.attr({ - 'data-interaction': 'download click - top', - 'data-download-version': type, - 'data-tile-position': tilePosition, - 'data-tile-size': tileSize - }); - }); - - // track Firefox download section button clicks - $('#firefox-download-section a.download-link').each(function() { - var platform; - var $this = $(this); - if ($this.parents('li').hasClass('os_android')) { - platform = 'Firefox Android'; - } else { - platform = 'Firefox Desktop'; - } - $this.attr({ - 'data-interaction': 'download click - primary', - 'data-download-version': platform - }); - - }); - -}); diff --git a/tests/pages/base.py b/tests/pages/base.py index 2a657b73366..f6363e42ac7 100644 --- a/tests/pages/base.py +++ b/tests/pages/base.py @@ -39,9 +39,9 @@ class Navigation(PageRegion): _root_locator = (By.ID, 'nav-main') _toggle_locator = (By.CLASS_NAME, 'toggle') _menu_locator = (By.ID, 'nav-main-menu') - _about_locator = (By.CSS_SELECTOR, 'a[data-link-type="about"]') - _participate_locator = (By.CSS_SELECTOR, 'a[data-link-type="participate"]') - _firefox_locator = (By.CSS_SELECTOR, 'a[data-link-type="firefox"]') + _about_locator = (By.CSS_SELECTOR, 'a[data-link-name="About"]') + _participate_locator = (By.CSS_SELECTOR, 'a[data-link-name="Participate"]') + _firefox_locator = (By.CSS_SELECTOR, 'a[data-link-name="Firefox"]') def show(self): assert not self.is_displayed, 'Menu is already displayed'