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

[Chris Johnston]

Fixes Google Analytics by adding it as a templatetag

[lp:~cjohnston/summit/ga-templatetag]

486. By Chris Johnston on 2013-02-26

Adds google analytics code

487. By Chris Johnston on 2013-02-26

Fixes issues with GA

488. By Chris Johnston on 2013-02-26

more fixes

489. By Chris Johnston on 2013-02-26

remove test code

490. By Chris Johnston on 2013-02-27

oops

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/linaro_settings.py'
--- summit/linaro_settings.py	2012-05-25 14:57:02 +0000
+++ summit/linaro_settings.py	2013-02-27 00:09:21 +0000
@@ -7,9 +7,14 @@
 
 SITE_ID = 2
 
+# Google Analytics code
+GOOGLE_ANALYTICS_CODE = 'UA-30315860-1'
+
 try:
     import linaro_website
 
+    INSTALLED_APPS.append('linaro_website')
+
     TEMPLATE_CONTEXT_PROCESSORS += (
         "linaro_website.media_processor",
         "linaro_website.popup_check",
 
=== modified file 'summit/settings.py'
--- summit/settings.py	2013-02-26 19:31:21 +0000
+++ summit/settings.py	2013-02-27 00:09:21 +0000
@@ -181,10 +181,10 @@
     'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
 
     ## ubuntu-website supplied templates and styles
-    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '49'),
+    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '54'),
 
     ## linaro-website supplied templates and styles
-    'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '51'),
+    'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '52'),
 }
 
 import logging
 
=== modified file 'summit/ubuntu_settings.py'
--- summit/ubuntu_settings.py	2012-04-17 01:53:48 +0000
+++ summit/ubuntu_settings.py	2013-02-27 00:09:21 +0000
@@ -5,12 +5,16 @@
 
 SITE_ROOT = 'http://summit.ubuntu.com'
 
+# Google Analytics code
+GOOGLE_ANALYTICS_CODE = 'UA-26810861-1'
 
 SITE_ID = 1
 
 try:
     import ubuntu_website
 
+    INSTALLED_APPS.append('ubuntu_website')
+    
     TEMPLATE_CONTEXT_PROCESSORS += (
         "ubuntu_website.media_processor",
         "ubuntu_website.popup_check",