Merge pull request #3962 from analytics-pros/bug-1248040-firefox-ios

[bug 1248040] Update GTM data attributes on family navigation and sid…
mozilla · Mar 14, 2016 · 2d8ccae · 2d8ccae
2 parents 5a9f63d + 58f9612
commit 2d8ccae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html
@@ -229,9 +229,9 @@ <h3>{{ cta_text }}</h3>
           <a data-id="ios" href="{{ url('firefox.ios') }}" class="primary-link" data-link-type="nav" data-link-name="for iOS"><div>{{ _('<span>for</span> iOS') }}</div></a>
 
           <ul class="subnav" id="ios-subnav">
-            <li><a href="{{ url('firefox.ios') }}"{% 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.ios') }}"{% if activesub == 'index' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for iOS: 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 iOS: 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 iOS: Private Browsing"><div>{{ _('Private Browsing') }}</div></a></li>
           </ul>
         </li>
         {% if activeprimary == 'os' %}
@@ -270,14 +270,14 @@ <h3>{{ cta_text }}</h3>
       </ul>
 
       <ul class="tertiarynav{% if activeprimary == 'ios' %} active{% endif %}">
-        <li><a rel="external" href="https://support.mozilla.org/products/ios" data-ga="ios - support">{{ _('Need help?') }}</a></li>
+        <li><a rel="external" href="https://support.mozilla.org/products/ios" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
       </ul>
 
       <ul class="tertiarynav{% if activeprimary == 'os' %} active{% endif %}">
-        <li><a rel="external" href="https://blog.mozilla.org/blog/category/firefox-os/" data-ga="os - news">{{ _('News') }}</a></li>
-        <li><a rel="external" href="https://developer.mozilla.org/Firefox_OS" data-ga="os - developers">{{ _('For developers') }}</a></li>
-        <li><a rel="external" href="https://find.firefox.com" data-ga="os - find my device">{{ _('Find My Device') }}</a></li>
-        <li><a rel="external" href="https://support.mozilla.org/products/firefox-os" data-ga="os - support">{{ _('Need help?') }}</a></li>
+        <li><a rel="external" href="https://blog.mozilla.org/blog/category/firefox-os/" data-link-type="nav" data-link-name="Side Menu: News">{{ _('News') }}</a></li>
+        <li><a rel="external" href="https://developer.mozilla.org/Firefox_OS" data-link-type="nav" data-link-name="Side Menu: For developers">{{ _('For developers') }}</a></li>
+        <li><a rel="external" href="https://find.firefox.com" data-link-type="nav" data-link-name="Side Menu: Find My Device">{{ _('Find My Device') }}</a></li>
+        <li><a rel="external" href="https://support.mozilla.org/products/firefox-os" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
       </ul>
     </div>{#-- /#fxfamilynav-tertiarynav --#}
 
@@ -349,7 +349,9 @@ <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" data-download-os="Android">{{ _('Send') }}</button>
+              <button type="submit" class="button-flat"
+              {% if platform == 'android' %} data-download-os="Android"
+              {% elif platform == 'ios' %} data-download-os="iOS" {% endif %}>{{ _('Send') }}</button>
             </div>
           </div>
           <p class="legal sms">

diff --git a/bedrock/firefox/templates/firefox/ios.html b/bedrock/firefox/templates/firefox/ios.html
@@ -34,7 +34,7 @@
         <a class="dl-button" rel="external" href="{{ firefox_ios_url('mozorg-ios_page-appstore-button') }}">
           <img src="{{ l10n_img('firefox/ios/btn-app-store.svg') }}" alt="{{ _('Download on the App Store') }}">
         </a>
-        <button class="send-to button-flat-dark" type="button">{{ _('Get Firefox for iOS') }}</button>
+        <button class="send-to button-flat-dark" type="button" data-button-name="Get Firefox for iOS">{{ _('Get Firefox for iOS') }}</button>
       </div>
     {% endcall %}
 {% endblock %}
@@ -54,10 +54,10 @@ <h1>{{ _('Firefox for iOS') }}</h1>
       <h2>{{ _('Add Firefox to your iPhone, iPad and iPod touch.') }}</h2>
 
       <p class="appstore-badge">
-        <a href="{{ firefox_ios_url('mozorg-ios_page-appstore-button') }}"><img src="{{ l10n_img('firefox/ios/btn-app-store.svg') }}" alt="{{ _('Download on the App Store') }}"></a>
+        <a href="{{ firefox_ios_url('mozorg-ios_page-appstore-button') }}" data-link-type="download" data-download-os="iOS"><img src="{{ l10n_img('firefox/ios/btn-app-store.svg') }}" alt="{{ _('Download on the App Store') }}"></a>
       </p>
       <p class="send-to-device">
-        <button class="send-to button-flat-green">{{ _('Get it now') }}</button>
+        <button class="send-to button-flat-green" data-button-name="Get it now">{{ _('Get it now') }}</button>
       </p>
     </div>
 
@@ -88,22 +88,22 @@ <h2>{{ _('Sign in to your Firefox Account to access your browsing info on all yo
     <div class="sync-cta">
 
       <div class="default">
-        <p><a href="{{ url('firefox.sync') }}" class="button-flat">{{ _('Learn more about Sync') }}</a></p>
+        <p><a href="{{ url('firefox.sync') }}" class="button-flat" data-link-type="button" data-link-name="Learn more about Sync">{{ _('Learn more about Sync') }}</a></p>
       </div>
 
       <div class="fx-signed-out">
-        <p><button type="button" class="button-flat sync-button">{{ _('Get started with Sync') }}</button></p>
+        <p><button type="button" class="button-flat sync-button" data-button-name="Get started with Sync">{{ _('Get started with Sync') }}</button></p>
         <p>{{ _('Already have an account?') }} <a href="https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync" class="go">{{ _('Sign in') }}</a></p>
       </div>
 
       <div class="fx-signed-in">
         <h3>{{ _('You’re already signed in!') }}</h3>
-        <p><a href="{{ url('firefox.sync') }}" class="go">{{ _('Learn more about Sync') }}</a></p>
+        <p><a href="{{ url('firefox.sync') }}" class="go" data-link-type="button" data-link-name="Learn more about Sync">{{ _('Learn more about Sync') }}</a></p>
       </div>
 
       <div class="fx-ios">
         <h3>{{ _('Sync your Firefox browsing history on iOS') }}</h3>
-        <p><button type="button" class="button-flat sync-start-ios">{{ _('Get started with Sync') }}</button></p>
+        <p><button type="button" class="button-flat sync-start-ios" data-button-name="Get started with Sync">{{ _('Get started with Sync') }}</button></p>
         <p><a href="{{ firefox_ios_url() }}" class="go">{{ _('Learn more in the App Store') }}</a></p>
       </div>