Summit

Merge lp:~cjohnston/summit/ga-templatetag into lp:summit

  1. ga-templatetag
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 490
Merged at revision: 487
Proposed branch: lp:~cjohnston/summit/ga-templatetag
Merge into: lp:summit
Diff against target: 56 lines (+11/-2)
3 files modified
summit/linaro_settings.py (+5/-0)
summit/settings.py (+2/-2)
summit/ubuntu_settings.py (+4/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/ga-templatetag
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+150674@code.launchpad.net

Commit message

Fixes Google Analytics by adding it as a templatetag

To post a comment you must log in.
lp:~cjohnston/summit/ga-templatetag updated
486. By Chris Johnston

Adds google analytics code

487. By Chris Johnston

Fixes issues with GA

488. By Chris Johnston

more fixes

489. By Chris Johnston

remove test code

490. By Chris Johnston

oops

Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/linaro_settings.py'
2--- summit/linaro_settings.py 2012-05-25 14:57:02 +0000
3+++ summit/linaro_settings.py 2013-02-27 00:09:21 +0000
4@@ -7,9 +7,14 @@
5
6 SITE_ID = 2
7
8+# Google Analytics code
9+GOOGLE_ANALYTICS_CODE = 'UA-30315860-1'
10+
11 try:
12 import linaro_website
13
14+ INSTALLED_APPS.append('linaro_website')
15+
16 TEMPLATE_CONTEXT_PROCESSORS += (
17 "linaro_website.media_processor",
18 "linaro_website.popup_check",
19
20=== modified file 'summit/settings.py'
21--- summit/settings.py 2013-02-26 19:31:21 +0000
22+++ summit/settings.py 2013-02-27 00:09:21 +0000
23@@ -181,10 +181,10 @@
24 'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
25
26 ## ubuntu-website supplied templates and styles
27- 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '49'),
28+ 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '54'),
29
30 ## linaro-website supplied templates and styles
31- 'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '51'),
32+ 'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '52'),
33 }
34
35 import logging
36
37=== modified file 'summit/ubuntu_settings.py'
38--- summit/ubuntu_settings.py 2012-04-17 01:53:48 +0000
39+++ summit/ubuntu_settings.py 2013-02-27 00:09:21 +0000
40@@ -5,12 +5,16 @@
41
42 SITE_ROOT = 'http://summit.ubuntu.com'
43
44+# Google Analytics code
45+GOOGLE_ANALYTICS_CODE = 'UA-26810861-1'
46
47 SITE_ID = 1
48
49 try:
50 import ubuntu_website
51
52+ INSTALLED_APPS.append('ubuntu_website')
53+
54 TEMPLATE_CONTEXT_PROCESSORS += (
55 "ubuntu_website.media_processor",
56 "ubuntu_website.popup_check",

Subscribers

People subscribed via source and target branches