[bug 1248040] Update GTM data attributes on Firefox top menu and on d…

…ownload buttons of build_link macro

bedrock/base/templates/product-all-macros.html

@@ -84,7 +84,10 @@ <h4 class="not-found{% if builds %} hide{% endif %}">{{ _('No matching languages
 #}
 {% macro build_link(build, platform, tooltip) %}
   {% if build.platforms[platform] %}
-    <td class="download {{ platform }}"><a href="{{ build.platforms[platform].download_url }}" title="{{ tooltip }}">{{ _('Download') }}</a></td>
+    <td class="download {{ platform }}"><a href="{{ build.platforms[platform].download_url }}" title="{{ tooltip }}"
+    {% if platform == 'android' %}data-link-type="download" data-download-os="Android"
+    {% elif platform == 'ios' %}data-link-type="download" data-download-os="iOS"
+    {% else %}data-link-type="download" data-download-os="Desktop"{% endif %}>{{ _('Download') }}</a></td>
   {% else %}
     <td class="unavailable">{{ _('Not Yet Available') }}</td>
   {% endif %}

bedrock/firefox/templates/firefox/includes/top-menu.html

@@ -1,29 +1,29 @@
 <nav id="nav-main" role="navigation">
   <span id="nav-main-toggle" class="toggle" role="button" aria-controls="nav-main-menu" aria-expanded="false" tabindex="0">{{_('Menu')}}</span>
   <ul id="nav-main-menu" class="has-submenus">
-    <li class="first" id="nav-main-features"><a href="{{ url('firefox.new') }}" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">{{_('Firefox')}}</a>
+    <li class="first" id="nav-main-features"><a href="{{ url('firefox.new') }}" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true" data-link-type="nav" data-link-name="Firefox">{{_('Firefox')}}</a>
       <ul aria-expanded="false" id="nav-main-features-submenu" class="submenu">
-        <li class="first"><a href="{{ url('firefox.desktop.index') }}" tabindex="-1">{{_('Desktop')}}</a></li>
-        <li><a href="{{ url('firefox.android.index') }}" tabindex="-1">{{_('Android')}}</a></li>
-        <li><a href="{{ url('firefox.developer') }}" tabindex="-1">{{ _('Developer Edition') }}</a></li>
+        <li class="first"><a href="{{ url('firefox.desktop.index') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Desktop">{{_('Desktop')}}</a></li>
+        <li><a href="{{ url('firefox.android.index') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Android">{{_('Android')}}</a></li>
+        <li><a href="{{ url('firefox.developer') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Developer Edition">{{ _('Developer Edition') }}</a></li>
         <li>
           <hr>{# <hr> before first sub/minor link #}
-          <a class="sublink" href="{{ url('firefox.sync') }}" tabindex="-1">{{ _('Sync') }}</a>
-          <a class="sublink" href="{{ url('firefox.hello') }}" tabindex="-1">{{ _('Hello') }}</a>
+          <a class="sublink" href="{{ url('firefox.sync') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Sync">{{ _('Sync') }}</a>
+          <a class="sublink" href="{{ url('firefox.hello') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Hello">{{ _('Hello') }}</a>
         </li>
       </ul>
     </li>
-    <li id="nav-main-addons"><a rel="external" href="https://addons.mozilla.org/" tabindex="0" aria-owns="nav-main-addons-submenu" aria-haspopup="true">{{_('Add-ons')}}</a>
+    <li id="nav-main-addons"><a rel="external" href="https://addons.mozilla.org/" tabindex="0" aria-owns="nav-main-addons-submenu" aria-haspopup="true" data-link-type="nav" data-link-name="Add-Ons">{{_('Add-ons')}}</a>
       <ul aria-expanded="false" id="nav-main-addons-submenu" class="submenu">
-        <li class="first"><a href="https://addons.mozilla.org/firefox/" tabindex="-1">{{_('Desktop Add-ons')}}</a></li>
-        <li><a href="https://addons.mozilla.org/android/" tabindex="-1">{{_('Android Add-ons')}}</a></li>
-        <li class="last"><a href="https://addons.mozilla.org/firefox/themes/" tabindex="-1">{{_('Themes')}}</a></li>
+        <li class="first"><a href="https://addons.mozilla.org/firefox/" tabindex="-1" data-link-type="nav" data-link-name="Add-Ons: Desktop Add-Ons">{{_('Desktop Add-ons')}}</a></li>
+        <li><a href="https://addons.mozilla.org/android/" tabindex="-1" data-link-type="nav" data-link-name="Add-Ons: Android Add-Ons">{{_('Android Add-ons')}}</a></li>
+        <li class="last"><a href="https://addons.mozilla.org/firefox/themes/" tabindex="-1" data-link-type="nav" data-link-name="Add-Ons: Themes">{{_('Themes')}}</a></li>
       </ul>
     </li>
-    <li id="nav-main-support"><a rel="external" href="https://support.mozilla.org/" tabindex="0" aria-owns="nav-main-support-submenu" aria-haspopup="true">{{_('Support')}}</a>
+    <li id="nav-main-support"><a rel="external" href="https://support.mozilla.org/" tabindex="0" aria-owns="nav-main-support-submenu" aria-haspopup="true" data-link-type="nav" data-link-name="Support">{{_('Support')}}</a>
       <ul aria-expanded="false" id="nav-main-support-submenu" class="submenu">
-        <li class="first"><a href="https://support.mozilla.org/products/firefox" tabindex="-1">{{_('Desktop Support')}}</a></li>
-        <li class="last"><a href="https://support.mozilla.org/products/mobile" tabindex="-1">{{_('Android Support')}}</a></li>
+        <li class="first"><a href="https://support.mozilla.org/products/firefox" tabindex="-1" data-link-type="nav" data-link-name="Support: Desktop Support">{{_('Desktop Support')}}</a></li>
+        <li class="last"><a href="https://support.mozilla.org/products/mobile" tabindex="-1" data-link-type="nav" data-link-name="Support: Android Support">{{_('Android Support')}}</a></li>
       </ul>
     </li>
   </ul>