Skip to content

Commit

Permalink
Update Hello tour GA events and templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexgibson
alexgibson committed Feb 12, 2015
1 parent 5b5e125 commit 7dbbea5
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 15 deletions.
6 changes: 3 additions & 3 deletions bedrock/firefox/templates/firefox/australis/fx36/firstrun-tour.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
{% block telemetry_id %}firstrun-tour-36-release{% endblock %}

{% block site_css %}
{{ css('firefox_fx36_firstrun') }}
{% stylesheet 'firefox_fx36_firstrun' %}
{% endblock %}

{% block js %}
{{ js('firefox_fx36_firstrun') }}
{% javascript 'firefox_fx36_firstrun' %}
{% endblock %}

{% block string_data %}
Expand Down Expand Up @@ -136,7 +136,7 @@ <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobb
</li>
</ul>
<div class="compact-title"></div>
<div class="tour-init" data-target="appMenu" data-icon="{{ MEDIA_URL }}img/firefox/australis/logo.png?2014-03" data-icon-high-res="{{ MEDIA_URL }}img/firefox/australis/logo-high-res.png?2014-03"></div>
<div class="tour-init" data-target="appMenu" data-icon="{{ static('img/firefox/australis/logo.png') }}" data-icon-high-res="{{ static('img/firefox/australis/logo-high-res.png') }}"></div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/australis/fx36/whatsnew-no-tour.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
{% block telemetry_id %}whatsnew-no-tour-36-release{% endblock %}

{% block site_css %}
{{ css('firefox_fx36_whatsnew_no_tour') }}
{% stylesheet 'firefox_fx36_whatsnew_no_tour' %}
{% endblock %}

{% block js %}
{{ js('firefox_fx36_whatsnew_no_tour') }}
{% javascript 'firefox_fx36_whatsnew_no_tour' %}
{% endblock %}

{% block string_data %}{% endblock %}
Expand Down
14 changes: 7 additions & 7 deletions bedrock/firefox/templates/firefox/australis/fx36/whatsnew-tour.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
{% block telemetry_id %}whatsnew-tour-36-release{% endblock %}

{% block site_css %}
{{ css('firefox_fx36_whatsnew') }}
{% stylesheet 'firefox_fx36_whatsnew' %}
{% endblock %}

{% block js %}
{{ js('firefox_fx36_whatsnew') }}
{% javascript 'firefox_fx36_whatsnew' %}
{% endblock %}

{% block string_data %}
Expand Down Expand Up @@ -95,9 +95,9 @@ <h2 class="tour-show-hello-panel step-target">
<li>{{ _('Simply start a conversation and share a link') }}</li>
<li>{{ _('Invite anyone, anywhere to join') }}</li>
</ul>
<div class="hello-prompt-door-hanger" data-title="{{ _('Keep conversations one click away') }}" data-text="{{ _('Add Hello to your toolbar so it’s here whenever you need it.') }}" data-button-add="{{ _('Add it now') }}" data-button-later="{{ _('Later') }}" data-icon="{{ MEDIA_URL }}img/firefox/australis/hello-icon.png" data-icon-high-res="{{ MEDIA_URL }}img/firefox/australis/hello-icon-high-res.png"></div>
<div class="hello-added-door-hanger" data-title="{{ _('Perfect!') }}" data-text="{{ _('Now using Hello will be even easier. To move or remove the icon, just open the menu and select Customize.') }}" data-try="{{ _('Try it now') }}"></div>
<div class="hello-later-door-hanger" data-title="{{ _('Want to add it later?') }}" data-text="{{ _('No problem. Just open this menu, select Customize and simply drag the Hello icon into your toolbar.') }}"></div>
<div class="hello-prompt-door-hanger" data-title="{{ _('Keep conversations one click away') }}" data-text="{{ _('Add Hello to your toolbar so it’s here whenever you need it.') }}" data-button-add="{{ _('Add it now') }}" data-button-later="{{ _('Later') }}" data-icon="{{ static('img/firefox/australis/hello-icon.png') }}" data-icon-high-res="{{ static('img/firefox/australis/hello-icon-high-res.png') }}"></div>
<div class="hello-added-door-hanger" data-title="{{ _('Perfect!') }}" data-text="{{ _('Now using Hello will be even easier. To move or remove the icon, just open the menu and select Customize.') }}" data-try="{{ _('Try it now') }}" data-icon="{{ static('img/firefox/australis/hello-icon.png') }}" data-icon-high-res="{{ static('img/firefox/australis/hello-icon-high-res.png') }}"></div>
<div class="hello-later-door-hanger" data-title="{{ _('Want to add it later?') }}" data-text="{{ _('No problem. Just open this menu, select Customize and simply drag the Hello icon into your toolbar.') }}" data-icon="{{ static('img/firefox/australis/hello-icon.png') }}" data-icon-high-res="{{ static('img/firefox/australis/hello-icon-high-res.png') }}"></div>
</div>
{{ high_res_img('img/firefox/australis/hello-1.png?02-2015', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
</li>
Expand All @@ -111,13 +111,13 @@ <h2>
<li>{{ _('Invite a friend to talk by sending them a link') }}</li>
<li>{{ _('Anyone can join — with or without Firefox') }}</li>
</ul>
<div class="hello-reminder-door-hanger step-target" data-title="{{ _('Here when you need it') }}" data-text="{{ _('Start and join conversations right from your toolbar.') }}"></div>
<div class="hello-reminder-door-hanger step-target" data-title="{{ _('Here when you need it') }}" data-text="{{ _('Start and join conversations right from your toolbar.') }}" data-icon="{{ static('img/firefox/australis/hello-icon.png') }}" data-icon-high-res="{{ static('img/firefox/australis/hello-icon-high-res.png') }}"></div>
</div>
{{ high_res_img('img/firefox/australis/hello-2.png?02-2015', {'alt': _('Connect with anyone over video right from Firefox'), 'width': '300', 'height': '188'}) }}
</li>
</ul>
<div class="compact-title"></div>
<div class="tour-init" data-target="appMenu" data-icon="{{ MEDIA_URL }}img/firefox/australis/hello-icon.png" data-icon-high-res="{{ MEDIA_URL }}img/firefox/australis/hello-icon-high-res.png"></div>
<div class="tour-init" data-target="appMenu" data-icon="{{ static('img/firefox/australis/hello-icon.png') }}" data-icon-high-res="{{ static('img/firefox/australis/hello-icon-high-res.png') }}"></div>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions bedrock/settings/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ def JINJA_CONFIG():
'source_filenames': (
'css/sandstone/sandstone.less',
'css/firefox/australis/australis-ui-tour.less',
'css/firefox/hello-animation.less',
'css/firefox/australis/fx36/common.less',
),
'output_filename': 'css/firefox_fx36_firstrun-bundle.css',
Expand All @@ -437,13 +438,15 @@ def JINJA_CONFIG():
'source_filenames': (
'css/sandstone/sandstone.less',
'css/firefox/australis/australis-ui-tour.less',
'css/firefox/hello-animation.less',
'css/firefox/australis/fx36/common.less',
),
'output_filename': 'css/firefox_fx36_whatsnew-bundle.css',
},
'firefox_fx36_whatsnew_no_tour': {
'source_filenames': (
'css/sandstone/sandstone.less',
'css/firefox/hello-animation.less',
'css/firefox/australis/fx36/common.less',
),
'output_filename': 'css/firefox_fx36_whatsnew_no_tour-bundle.css',
Expand Down
7 changes: 7 additions & 0 deletions media/css/firefox/australis/australis-ui-tour.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,13 @@ body.noscroll {
width: 100%;
}

.progress[aria-valuemax="2"][aria-valuenow="1"] .indicator {
width: 50%;
}
.progress[aria-valuemax="2"][aria-valuenow="2"] .indicator {
width: 100%;
}

.logo {
width: 43px;
height: 44px;
Expand Down
9 changes: 6 additions & 3 deletions media/js/firefox/australis/browser-tour.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,11 +620,11 @@ if (typeof Mozilla == 'undefined') {
*/
BrowserTour.prototype.highlightHelloButton = function () {
var $dataElm = $('.hello-added-door-hanger');
var icon = Mozilla.ImageHelper.isHighDpi() ? $dataElm.data('iconHighRes') : $dataElm.data('icon');
var target = 'loop';

Mozilla.UITour.showHighlight(target, 'wobble');

var icon = null;
var buttons = [];

var options = {
Expand All @@ -646,8 +646,8 @@ if (typeof Mozilla == 'undefined') {
*/
BrowserTour.prototype.laterHelloButton = function () {
var $dataElm = $('.hello-later-door-hanger');
var icon = Mozilla.ImageHelper.isHighDpi() ? $dataElm.data('iconHighRes') : $dataElm.data('icon');

var icon = '';
var buttons = [];

var options = {
Expand All @@ -663,13 +663,16 @@ if (typeof Mozilla == 'undefined') {
buttons,
options
);

gaTrack(['_trackEvent', 'Tour Interaction', 'Later', 'The Hello icon']);
};

/*
* Remind user where the Hello icon is
*/
BrowserTour.prototype.reminderHelloButton = function () {
var $dataElm = $('.hello-reminder-door-hanger');
var icon = Mozilla.ImageHelper.isHighDpi() ? $dataElm.data('iconHighRes') : $dataElm.data('icon');
var target = 'loop';
var that = this;

Expand All @@ -690,7 +693,7 @@ if (typeof Mozilla == 'undefined') {
target,
that.getText($dataElm.data('title')),
that.getText($dataElm.data('text')),
null,
icon,
buttons,
options
);
Expand Down

0 comments on commit 7dbbea5

Please sign in to comment.