Merge pull request #3901 from analytics-pros/bug-1248040-homepage

[bug 1248040] Update GTM data attributes on homepage navigation and F…

bedrock/firefox/templates/firefox/includes/download-button.html

@@ -43,7 +43,10 @@
       <li class="os_{{ plat.os }}{% if plat.arch %} {{ plat.arch }}{% endif %}">
         <a class="download-link"
            href="{{ plat.download_link }}"{% if plat.download_link_direct %}
-           data-direct-link="{{ plat.download_link_direct }}"{% endif %}>
+           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 %}>
           <span class="download-content">
             {% if plat.os == 'android' %}
               {% if channel == 'beta' %}

bedrock/mozorg/templates/mozorg/home/home.html

@@ -79,7 +79,7 @@
   <div class="container">
     {% block tabzilla_tab %}
       <div id="tabzilla">
-        <a href="{{ url('mozorg.home') }}">Mozilla</a>
+        <a href="{{ url('mozorg.home') }}" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
       </div>
     {% endblock %}
 
@@ -88,16 +88,16 @@
         <span class="toggle" role="button" aria-controls="nav-main-menu" aria-expanded="false" tabindex="0">{{_('Menu')}}</span>
         <ul id="nav-main-menu">
           <li class="first about-item">
-            <a data-link-type="about" data-element-location="nav click" href="{{ url('mozorg.about') }}">{{_('About')}}</a>
+            <a href="{{ url('mozorg.about') }}" data-link-type="nav" data-link-name="About">{{_('About')}}</a>
           </li>
           <li class="contribute-item">
-            <a data-link-type="participate" data-element-location="nav click" href="{{ url('mozorg.contribute') }}">{{_('Participate')}}</a>
+            <a href="{{ url('mozorg.contribute') }}" data-link-type="nav" data-link-name="Participate">{{_('Participate')}}</a>
           </li>
           <li class="products-item">
-            <a data-link-type="firefox" data-element-location="nav click" href="{{ url('firefox.family.index') }}">{{_('Firefox')}}</a>
+            <a href="{{ url('firefox.family.index') }}" data-link-type="nav" data-link-name="Firefox">{{_('Firefox')}}</a>
           </li>
           <li class="last donate-item">
-            <a data-link-type="donate" data-element-location="nav click" href="{{ donate_url('header') }}">{{_('Donate')}}</a>
+            <a href="{{ donate_url('header') }}" data-link-type="nav" data-link-name="Donate">{{_('Donate')}}</a>
           </li>
         </ul>
       </nav>
@@ -314,7 +314,7 @@ <h4>{{_('Committed to <strong>you, your privacy</strong> and an <strong>open Web
         </li>
       </ul>
 
-      <a class="contribute-btn" href="{{ url('mozorg.contribute') }}" data-element-location="button-click" data-link-type="Get Involved with Mozilla today">
+      <a class="contribute-btn" href="{{ url('mozorg.contribute') }}" data-link-type="button" data-link-name="Get Involved with Mozilla today">
         {{ _('Get Involved with Mozilla today') }}
       </a>
     </div>

bedrock/mozorg/templates/mozorg/home/includes/upcoming-events.html

@@ -50,7 +50,7 @@ <h3>{{ event.title|safe }}</h3>
       {% endfor %}
       </ul>
     </div>
-    <a class="more-large" href="{{ url('mozorg.contribute.events') }}">{{ _('See all events') }}</a>
+    <a class="more-large" href="{{ url('mozorg.contribute.events') }}" data-link-type="button" data-link-name="See all events">{{ _('See all events') }}</a>
   </div>
 </section>
 {% endif %}

bedrock/settings/static_media.py

@@ -1367,7 +1367,6 @@
     'home': {
         'source_filenames': (
             'js/mozorg/home/home.js',
-            'js/mozorg/home/ga-tracking.js',
         ),
         'output_filename': 'js/home-bundle.js',
     },

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'