Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use frontend_toolkit’s analytics #557

Merged
merged 4 commits into from
Mar 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ end

gem 'plek', '1.7.0'

gem 'govuk_frontend_toolkit', '3.1.0'
gem 'govuk_frontend_toolkit', '3.2.1'
if ENV['GOVUK_TEMPLATE_DEV']
gem 'govuk_template', :path => "../govuk_template"
else
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GEM
null_logger
plek
rest-client (~> 1.6.3)
govuk_frontend_toolkit (3.1.0)
govuk_frontend_toolkit (3.2.1)
rails (>= 3.1.0)
sass (>= 3.2.0)
govuk_template (0.10.1)
Expand Down Expand Up @@ -175,7 +175,7 @@ DEPENDENCIES
capybara (= 2.1.0)
exception_notification
gds-api-adapters (= 7.18.0)
govuk_frontend_toolkit (= 3.1.0)
govuk_frontend_toolkit (= 3.2.1)
govuk_template (= 0.10.1)
image_optim (= 0.17.1)
jasmine-rails (= 0.10.6)
Expand Down
13 changes: 7 additions & 6 deletions app/assets/javascripts/analytics.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
//= require analytics/google-analytics-universal-tracker
//= require analytics/google-analytics-classic-tracker
//= require analytics/tracker
//= require analytics/init
//= require govuk/analytics/google-analytics-universal-tracker
//= require govuk/analytics/google-analytics-classic-tracker
//= require govuk/analytics/tracker
//= require govuk/analytics/print-intent
//= require govuk/analytics/error-tracking

//= require analytics/static-tracker
//= require analytics/init
//= require analytics/print-tracking
//= require analytics/print-intent
//= require analytics/scroll-tracker
//= require analytics/error-tracking
22 changes: 0 additions & 22 deletions app/assets/javascripts/analytics/error-tracking.js

This file was deleted.

111 changes: 0 additions & 111 deletions app/assets/javascripts/analytics/google-analytics-classic-tracker.js

This file was deleted.

104 changes: 0 additions & 104 deletions app/assets/javascripts/analytics/google-analytics-universal-tracker.js

This file was deleted.

4 changes: 2 additions & 2 deletions app/assets/javascripts/analytics/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"use strict";

// Load Google Analytics libraries
GOVUK.Tracker.load();
GOVUK.StaticTracker.load();

// Use document.domain in dev, preview and staging so that tracking works
// Otherwise explicitly set the domain as www.gov.uk (and not gov.uk).
var cookieDomain = (document.domain == 'www.gov.uk') ? '.www.gov.uk' : document.domain;

// Configure profiles, setup custom vars, track initial pageview
var analytics = new GOVUK.Tracker({
var analytics = new GOVUK.StaticTracker({
universalId: 'UA-26179049-7',
classicId: 'UA-26179049-1',
cookieDomain: cookieDomain
Expand Down
31 changes: 0 additions & 31 deletions app/assets/javascripts/analytics/print-intent.js

This file was deleted.

Loading