From d5b74254a59ca1f5c33cafdfaaeda8d80b4b5d75 Mon Sep 17 00:00:00 2001
From: James Lorence <james.lorence@analyticspros.com>
Date: Thu, 10 Mar 2016 10:38:07 -0800
Subject: [PATCH] [bug 1248040] Update GTM data attributes on firstrun and
 australis/firstrun tabzilla and footer, and base template navigation

---
 bedrock/base/templates/base.html              |  8 +++---
 .../templates/firefox/australis/base.html     |  2 +-
 .../templates/firefox/australis/firstrun.html | 10 +++----
 .../firefox/australis/fx36/tour.html          | 26 +++++++++----------
 .../templates/firefox/firstrun/firstrun.html  | 10 +++----
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html
index 4e4cb3b8f22..161a97eb7d3 100644
--- a/bedrock/base/templates/base.html
+++ b/bedrock/base/templates/base.html
@@ -106,16 +106,16 @@
         <nav id="nav-main" role="navigation">
           <ul>
             <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>
diff --git a/bedrock/firefox/templates/firefox/australis/base.html b/bedrock/firefox/templates/firefox/australis/base.html
index 5b08eaa92e4..80ee8a294a2 100644
--- a/bedrock/firefox/templates/firefox/australis/base.html
+++ b/bedrock/firefox/templates/firefox/australis/base.html
@@ -26,7 +26,7 @@
 {% block site_header %}
   <header id="masthead">
     <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>
     {% block site_header_nav %}{% endblock %}
     {% block site_header_logo %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/australis/firstrun.html b/bedrock/firefox/templates/firefox/australis/firstrun.html
index a975f163d19..d8f4a5e05af 100644
--- a/bedrock/firefox/templates/firefox/australis/firstrun.html
+++ b/bedrock/firefox/templates/firefox/australis/firstrun.html
@@ -39,7 +39,7 @@ <h2>{{ _('Have Firefox on another device?') }}</h2>
       <p>{{ _('You don’t have to start over. Access your history, bookmarks and more.')}}</p>
     </header>
     <div class="sync-cta">
-      <a href="{{ url('firefox.sync') }}" class="button">{{ _('Get started with Sync') }}</a>
+      <a href="{{ url('firefox.sync') }}" class="button" data-link-type="button" data-link-name="Get started with Sync">{{ _('Get started with Sync') }}</a>
     </div>
   </div>
   <div class="sync-anim-wrapper">
@@ -54,12 +54,12 @@ <h2>{{ _('Have Firefox on another device?') }}</h2>
 {% block site_footer %}
   <footer role="contentinfo">
     <ul>
-      <li><a href="{{ url('firefox.desktop.index') }}" class="more">{{ _('Firefox Features') }}</a></li>
-      <li><a href="https://support.mozilla.org/products/firefox" class="more">{{ _('Firefox Help') }}</a></li>
+      <li><a href="{{ url('firefox.desktop.index') }}" class="more" data-link-type="footer" data-link-name="Firefox Features">{{ _('Firefox Features') }}</a></li>
+      <li><a href="https://support.mozilla.org/products/firefox" class="more" data-link-type="footer" data-link-name="Firefox Help">{{ _('Firefox Help') }}</a></li>
     </ul>
     <ul>
-      <li><a href="{{ url('legal.index') }}">{{ _('Legal') }}</a></li>
-      <li><a href="{{ url('privacy') }}">{{ _('Privacy') }}</a></li>
+      <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal') }}</a></li>
+      <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy') }}</a></li>
     </ul>
   </footer>
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/australis/fx36/tour.html b/bedrock/firefox/templates/firefox/australis/fx36/tour.html
index 8b77ae78780..1417be81cd2 100644
--- a/bedrock/firefox/templates/firefox/australis/fx36/tour.html
+++ b/bedrock/firefox/templates/firefox/australis/fx36/tour.html
@@ -55,7 +55,7 @@
 {% block site_header %}
   <header id="masthead">
     <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>
     {% block site_header_nav %}{% endblock %}
     {% block site_header_logo %}{% endblock %}
@@ -81,7 +81,7 @@ <h1>{{ _('Welcome to Firefox') }}</h1>
       <div class="promo-copy">
         <h2>{{ _('Get to know Hello') }}</h2>
         <p>{{ _('Firefox Hello is the easiest way to connect with friends and family for free over video.') }}</p>
-        <a id="learn-more" href="{{ url('firefox.hello') }}" class="button-flat">{{ _('Learn more') }}</a>
+        <a id="learn-more" href="{{ url('firefox.hello') }}" class="button-flat" data-link-type="button" data-link-name="Learn more">{{ _('Learn more') }}</a>
         <p id="powered-by">{{ _('Powered by %s')|format(high_res_img('firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}</p>
       </div>
       <div class="promo-media">
@@ -94,13 +94,13 @@ <h2>{{ _('Get to know Hello') }}</h2>
 
   <div id="ui-tour" tabindex="-1" aria-expanded="false">
     <div class="cta">
-      <button type="button" aria-controls="ui-tour">{{ _('Start browsing') }}</button>
+      <button type="button" aria-controls="ui-tour" data-button-name="Start browsing">{{ _('Start browsing') }}</button>
     </div>
     <div class="tour-tip"></div>
     <div class="ui-tour-controls">
-      <button type="button" class="step prev" aria-controls="tour-steps tour-progress">{{ _('Previous') }}</button>
-      <button type="button" class="step next" aria-controls="tour-steps tour-progress">{{ _('Next') }}</button>
-      <button type="button" class="close" aria-controls="tour-steps tour-progress">{{ _('Close') }}</button>
+      <button type="button" class="step prev" aria-controls="tour-steps tour-progress" data-button-name="Previous">{{ _('Previous') }}</button>
+      <button type="button" class="step next" aria-controls="tour-steps tour-progress" data-button-name="Next">{{ _('Next') }}</button>
+      <button type="button" class="close" aria-controls="tour-steps tour-progress" data-button-name="Close">{{ _('Close') }}</button>
     </div>
     <div class="tour-background">
       <div class="tour-inner">
@@ -121,7 +121,7 @@ <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble
               <ul>
                 <li>{{ _('The features you use most, all in one place') }}</li>
                 <li>{{ _('Grouped together for quick, easy access') }}</li>
-                <li><a href="#" role="button" class="more">{{ _('Connect with anyone over video right from Firefox') }}</a></li>
+                <li><a href="#" role="button" class="more" data-link-type="button" data-link-name="Connect with anyone over video">{{ _('Connect with anyone over video right from Firefox') }}</a></li>
               </ul>
             </div>
             {{ high_res_img('firefox/australis/diag-menu-bar.jpg', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
@@ -134,7 +134,7 @@ <h2 class="tour-show-hello-panel step-target">
               <ul>
                 <li>{{ _('Connect over video with anyone, anywhere') }}</li>
                 <li>{{ _('It’s free! No account, sign-in or downloads required') }}</li>
-                <li><a href="#" role="button" class="more">{{ _('Choose how you want to search') }}</a></li>
+                <li><a href="#" role="button" class="more" data-link-type="button" data-link-name="Choose how you want to search">{{ _('Choose how you want to search') }}</a></li>
               </ul>
             </div>
             {{ high_res_img('firefox/australis/hello-1.png', {'alt': _('Connect with anyone over video right from Firefox'), 'width': '240', 'height': '178', 'id': 'hello-img-1'}) }}
@@ -148,7 +148,7 @@ <h2 class="tour-highlight step-target" data-target="searchIcon" data-effect="wob
               <ul>
                 <li>{{ _('Search suggestions appear as you type') }}</li>
                 <li>{{ _('Choose the right site for every search') }}</li>
-                <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
+                <li><a href="#" role="button" class="more" data-link-type="button" data-link-name="Use the star to create bookmarks">{{ _('Use the star to create bookmarks') }}</a></li>
               </ul>
             </div>
             {{ high_res_img('firefox/australis/diag-search.jpg', {'alt': _('Search suggestions appear as you type'), 'width': '300', 'height': '188'}) }}
@@ -188,12 +188,12 @@ <h1>{{ _('Welcome to Firefox') }}</h1>
 {% block site_footer %}
   <footer role="contentinfo">
     <ul>
-      <li><a href="{{ url('firefox.desktop.index') }}" class="more">{{ _('Firefox Features') }}</a></li>
-      <li><a href="https://support.mozilla.org/products/firefox" class="more">{{ _('Firefox Help') }}</a></li>
+      <li><a href="{{ url('firefox.desktop.index') }}" class="more" data-link-type="footer" data-link-name="Firefox Features">{{ _('Firefox Features') }}</a></li>
+      <li><a href="https://support.mozilla.org/products/firefox" class="more" data-link-type="footer" data-link-name="Firefox Help">{{ _('Firefox Help') }}</a></li>
     </ul>
     <ul>
-      <li><a href="{{ url('legal.index') }}">{{ _('Legal') }}</a></li>
-      <li><a href="{{ url('privacy') }}">{{ _('Privacy') }}</a></li>
+      <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal') }}</a></li>
+      <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy') }}</a></li>
     </ul>
   </footer>
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/firstrun/firstrun.html b/bedrock/firefox/templates/firefox/firstrun/firstrun.html
index bf223025975..19d680926d3 100644
--- a/bedrock/firefox/templates/firefox/firstrun/firstrun.html
+++ b/bedrock/firefox/templates/firefox/firstrun/firstrun.html
@@ -37,7 +37,7 @@
   <header id="masthead">
     {% 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 %}
     {% block site_header_nav %}{% endblock %}
@@ -70,11 +70,11 @@ <h2>{{ _('Sign in to Firefox and you’re good to go.') }}</h2>
 {% block site_footer %}
 <footer id="footer">
   <div class="container">
-    <a class="mozlogo" href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a class="mozlogo" href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a>
     <ul>
-      <li><a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a></li>
-      <li><a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a></li>
-      <li><a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a></li>
+      <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy Policy') }}</a></li>
+      <li><a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>
+      <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal Notices') }}</a></li>
     </ul>
   </div>
 </footer>