Skip to content

Commit

Permalink
[bug 1248040] Update GTM data attributes on Firefox navigation and
Browse files Browse the repository at this point in the history 
standard site footer
  • Loading branch information
James Lorence committed Feb 19, 2016
1 parent 6eb2aa3 commit 9c8580f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
28 changes: 14 additions & 14 deletions bedrock/base/templates/includes/site-footer.html
View file
Expand Up @@ -12,34 +12,34 @@ <h1 class="logo"><a href="{{ url('mozorg.home') }}">Mozilla</a></h1>
</div>
<div class="col col-2">
<ul class="links-join">
<li><a href="{{ url('mozorg.contact.contact-landing') }}">{{ _('Contact Us') }}</a></li>
<li class="wrap"><a href="{{ url('mozorg.partnerships') }}">{{ _('Partner with Us' ) }}</a></li>
<li class="clear"><a href="{{ donate_url('footer') }}" class="donate">{{ _('Donate') }}</a></li>
<li class="wrap"><a href="{{ url('mozorg.contribute.friends') }}">{{ _('Firefox Friends') }}</a></li>
<li class="clear"><a href="https://wiki.mozilla.org/Webdev/GetInvolved/mozilla.org">{{ _('Contribute to this site') }}</a></li>
<li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-type="footer" data-link-name="Contact Us">{{ _('Contact Us') }}</a></li>
<li class="wrap"><a href="{{ url('mozorg.partnerships') }}" data-link-type="footer" data-link-name="Partner with Us">{{ _('Partner with Us' ) }}</a></li>
<li class="clear"><a href="{{ donate_url('footer') }}" class="donate" data-link-type="footer" data-link-name="Donate">{{ _('Donate') }}</a></li>
<li class="wrap"><a href="{{ url('mozorg.contribute.friends') }}" data-link-type="footer" data-link-name="Firefox Friends">{{ _('Firefox Friends') }}</a></li>
<li class="clear"><a href="https://wiki.mozilla.org/Webdev/GetInvolved/mozilla.org" data-link-type="footer" data-link-name="Contribute to this site">{{ _('Contribute to this site') }}</a></li>
</ul>
<ul class="links-legal">
<li><a href="{{ url('privacy') }}">{{ _('Privacy') }}</a></li>
<li class="wrap"><a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a></li>
<li class="wrap"><a href="{{ url('legal.index') }}">{{ _('Legal') }}</a></li>
<li class="clear"><a href="{{ url('legal.fraud-report') }}">{{ _('Report Trademark Abuse') }}</a></li>
<li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy') }}</a></li>
<li class="wrap"><a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>
<li class="wrap"><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal') }}</a></li>
<li class="clear"><a href="{{ url('legal.fraud-report') }}" data-link-type="footer" data-link-name="Report Trademark Abuse">{{ _('Report Trademark Abuse') }}</a></li>
</ul>
</div>
<div class="col col-3">
<ul class="links-social">
<li>
{{ _('Mozilla:') }}
<ul>
<li><a href="https://twitter.com/mozilla">{{ _('Twitter') }}<span> (@mozilla)</span></a></li>
<li><a href="https://www.facebook.com/mozilla">{{ _('Facebook') }}<span> (Mozilla)</span></a></li>
<li><a href="https://twitter.com/mozilla" data-link-type="footer" data-link-name="Twitter (@mozilla)">{{ _('Twitter') }}<span> (@mozilla)</span></a></li>
<li><a href="https://www.facebook.com/mozilla" data-link-type="footer" data-link-name="Facebook (Mozilla)">{{ _('Facebook') }}<span> (Mozilla)</span></a></li>
</ul>
</li>
<li>
{{ _('Firefox:') }}
<ul>
<li><a href="{{ firefox_twitter_url() }}">{{ _('Twitter') }}<span> (@firefox)</span></a></li>
<li><a href="https://www.facebook.com/Firefox">{{ _('Facebook') }}<span> (Firefox)</span></a></li>
<li><a href="https://www.youtube.com/firefoxchannel">{{ _('YouTube') }}<span> (firefoxchannel)</span></a></li>
<li><a href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-name="Twitter (@firefox)">{{ _('Twitter') }}<span> (@firefox)</span></a></li>
<li><a href="https://www.facebook.com/Firefox" data-link-type="footer" data-link-name="Facebook (Firefox)">{{ _('Facebook') }}<span> (Firefox)</span></a></li>
<li><a href="https://www.youtube.com/firefoxchannel" data-link-type="footer" data-link-name="YouTube (firefoxchannel)">{{ _('YouTube') }}<span> (firefoxchannel)</span></a></li>
</ul>
</li>
</ul>
Expand Down
32 changes: 16 additions & 16 deletions bedrock/base/templates/macros.html
View file
Expand Up @@ -194,12 +194,12 @@ <h3>{{ cta_text }}</h3>
<ul id="fxfamilynav-primary" class="primarynav">
{# L10n: The <span> elements below are for visual formatting #}
<li{% if activeprimary == 'desktop' %} class="active"{% endif %}>
<a data-id="desktop" href="{{ url('firefox.desktop.index') }}" class="primary-link"><div>{{ _('<span>for</span> Desktop') }}</div></a>
<a data-id="desktop" href="{{ url('firefox.desktop.index') }}" class="primary-link" data-link-type="nav" data-link-name="for Desktop"><div>{{ _('<span>for</span> Desktop') }}</div></a>

<ul class="subnav" id="desktop-subnav">
{# note: Removing hassubsubnav for now because after localization nav items get pushed to two lines #}
<li {# {% if activesub in ('index', 'trust', 'customize', 'fast') %} class="hassubsubnav"{% endif %} #}>
<a href="{{ url('firefox.desktop.index') }}"{% if activesub == 'index' %} class="selected"{% endif %}><div>{{ _('Overview') }}</div></a>
<a href="{{ url('firefox.desktop.index') }}"{% if activesub == 'index' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Desktop: Overview"><div>{{ _('Overview') }}</div></a>

{# note: Removing items for now because after localization nav items get pushed to two lines
{% if activesub in ('index', 'trust', 'customize', 'fast') %}
Expand All @@ -211,13 +211,13 @@ <h3>{{ cta_text }}</h3>
{% endif %}
#}
</li>
<li><a href="{{ url('firefox.sync') }}"{% if activesub == 'sync' %} class="selected"{% endif %}><div>{{ _('Sync') }}</div></a></li>
<li><a href="{{ url('firefox.hello') }}"{% if activesub == 'hello' %} class="selected"{% endif %}><div>{{ _('Hello') }}</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.sync') }}"{% if activesub == 'sync' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Desktop: Sync"><div>{{ _('Sync') }}</div></a></li>
<li><a href="{{ url('firefox.hello') }}"{% if activesub == 'hello' %} class="selected"{% endif %} data-link-type="nav" data-link-name="for Desktop: Hello"><div>{{ _('Hello') }}</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 Desktop: Private Browsing"><div>{{ _('Private Browsing') }}</div></a></li>
</ul>
</li>
<li{% if activeprimary == 'android' %} class="active"{% endif %}>
<a data-id="android" href="{{ url('firefox.android.index') }}" class="primary-link"><div>{{ _('<span>for</span> Android') }}</div></a>
<a data-id="android" href="{{ url('firefox.android.index') }}" class="primary-link" data-link-type="nav" data-link-name="for Android"><div>{{ _('<span>for</span> Android') }}</div></a>

<ul class="subnav" id="android-subnav">
<li><a href="{{ url('firefox.android.index') }}"{% if activesub == 'index' %} class="selected"{% endif %}><div>{{ _('Overview') }}</div></a></li>
Expand All @@ -226,7 +226,7 @@ <h3>{{ cta_text }}</h3>
</ul>
</li>
<li{% if activeprimary == 'ios' %} class="active"{% endif %}>
<a data-id="ios" href="{{ url('firefox.ios') }}" class="primary-link"><div>{{ _('<span>for</span> iOS') }}</div></a>
<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>
Expand All @@ -235,7 +235,7 @@ <h3>{{ cta_text }}</h3>
</ul>
</li>
<li{% if activeprimary == 'os' %} class="active"{% endif %}>
<a data-id="os" href="{{ url('firefox.os.index') }}" class="primary-link"><div>{{ _('Firefox OS') }}</div></a>
<a data-id="os" href="{{ url('firefox.os.index') }}" class="primary-link" data-link-type="nav" data-link-name="Firefox OS"><div>{{ _('Firefox OS') }}</div></a>

<ul class="subnav" id="os-subnav">
<li><a data-id="os-index" href="{{ url('firefox.os.index') }}"{% if activesub == 'index' %} class="selected"{% endif %}><div>{{ _('Overview') }}</div></a></li>
Expand All @@ -252,12 +252,12 @@ <h3>{{ cta_text }}</h3>
<div class="triangle-border"></div>

<ul class="tertiarynav{% if activeprimary == 'desktop' %} active{% endif %}">
<li><a href="{{ url('firefox.dnt') }}" data-ga="desktop - dnt">{{ _('Do Not Track') }}</a></li>
<li><a href="{{ url('firefox.interest-dashboard') }}" data-ga="desktop - interest dashboard">{{ _('Interest Dashboard') }}</a></li>
<li><a href="{{ url('firefox.developer') }}" data-ga="desktop - developer edition">{{ _('Developer Edition') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/kb/private-browsing-browse-web-without-saving-info" data-ga="desktop - private browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org" data-ga="desktop - addons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/firefox" data-ga="desktop - support">{{ _('Need help?') }}</a></li>
<li><a href="{{ url('firefox.dnt') }}" data-ga="desktop - dnt" data-link-type="nav" data-link-name="Side Menu: Do Not Track">{{ _('Do Not Track') }}</a></li>
<li><a href="{{ url('firefox.interest-dashboard') }}" data-ga="desktop - interest dashboard" data-link-type="nav" data-link-name="Side Menu: Interest Dashboard">{{ _('Interest Dashboard') }}</a></li>
<li><a href="{{ url('firefox.developer') }}" data-ga="desktop - developer edition" data-link-type="nav" data-link-name="Side Menu: Developer Edition">{{ _('Developer Edition') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/kb/private-browsing-browse-web-without-saving-info" data-ga="desktop - private browsing" data-link-type="nav" data-link-name="Side Menu: Private Browsing">{{ _('Private Browsing') }}</a></li>
<li><a rel="external" href="https://addons.mozilla.org" data-ga="desktop - addons" data-link-type="nav" data-link-name="Side Menu: Add-ons">{{ _('Add-ons') }}</a></li>
<li><a rel="external" href="https://support.mozilla.org/products/firefox" data-ga="desktop - support" data-link-type="nav" data-link-name="Side Menu: Need help?">{{ _('Need help?') }}</a></li>
</ul>

<ul class="tertiarynav{% if activeprimary == 'android' %} active{% endif %}">
Expand All @@ -282,7 +282,7 @@ <h3>{{ cta_text }}</h3>
{# Page will dictate CTA (button, usually) to be placed in this wrapper #}
<div id="fxfamilynav-cta-wrapper" class="fxfamilynav-cta-wrapper">{% if caller %}{{ caller() }}{% endif %}</div>

<button type="button" id="fxfamilynav-tertiarynav-trigger" class="fxfamilynav-tertiarynav-trigger" aria-controls="fxfamilynav-tertiarynav">
<button type="button" id="fxfamilynav-tertiarynav-trigger" class="fxfamilynav-tertiarynav-trigger" aria-controls="fxfamilynav-tertiarynav" data-link-type="nav" data-link-name="Open Side Menu">
<span>{{ _('Menu') }}</span>
<div class="trigger-dots">
<div class="trigger-dot"></div>
Expand All @@ -292,7 +292,7 @@ <h3>{{ cta_text }}</h3>
</button>

<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>
</div>{#-- /.container --#}
</header>{#-- /#fxfamilynav-header --#}
Expand Down

0 comments on commit 9c8580f

Please sign in to comment.