From 4fa17bbfa99064a71632fc8a4775e97cabdbadcf Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 12:56:49 +0100
Subject: [PATCH 1/6] Analytics is included under the Site admin

---
 google_analytics/admin.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/google_analytics/admin.py b/google_analytics/admin.py
index 2f0571f..18f0661 100644
--- a/google_analytics/admin.py
+++ b/google_analytics/admin.py
@@ -1,4 +1,12 @@
-from google_analytics.models import Analytics
+from .models import Analytics
 from django.contrib import admin
+from django.contrib.sites.admin import SiteAdmin, Site
 
-admin.site.register(Analytics)
+class AnalyticsInlineAdmin(admin.StackedInline):
+    model = Analytics
+
+class AnalyticsSiteAdmin(SiteAdmin):
+    inlines = [AnalyticsInlineAdmin]
+
+admin.site.unregister(Site)
+admin.site.register(Site, AnalyticsSiteAdmin)
\ No newline at end of file

From c6a221117e968b281824f7fe341727718ffdf25e Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 13:14:29 +0100
Subject: [PATCH 2/6] Switched to setuptools to support development

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e3706cd..be54070 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(name='google_analytics',
       version='0.2',

From b7400b130619a0aaa6b5a76a20e08905db30e0cd Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 13:14:50 +0100
Subject: [PATCH 3/6] Added more customizability to the model.

---
 google_analytics/models.py                    |  6 +++++-
 .../analytics_async_template.html             |  1 +
 google_analytics/templatetags/analytics.py    | 21 ++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/google_analytics/models.py b/google_analytics/models.py
index 58e0eed..7ac462f 100644
--- a/google_analytics/models.py
+++ b/google_analytics/models.py
@@ -3,8 +3,12 @@
 from django.contrib.sites.models import Site
 
 class Analytics(models.Model):
-    site = models.ForeignKey(Site)
+    site = models.OneToOneField(Site)
     analytics_code = models.CharField(blank=True, max_length=100)
+    analytics_domain = models.CharField(blank=True, max_length=100,
+        help_text="You can set here the analytics domain to merge reports with other sites")
+    track_page_load = models.BooleanField("Track page load time",
+        blank=True, default=False)
 
     def __unicode__(self):
         return u"%s" % (self.analytics_code)
diff --git a/google_analytics/templates/google_analytics/analytics_async_template.html b/google_analytics/templates/google_analytics/analytics_async_template.html
index e706e5b..8b4b71e 100644
--- a/google_analytics/templates/google_analytics/analytics_async_template.html
+++ b/google_analytics/templates/google_analytics/analytics_async_template.html
@@ -1,6 +1,7 @@
 <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '{{ analytics_code }}']);
+    {% if analytics_domain %}_gaq.push(['_setDomainName', '{{ analytics_domain }}']);{% endif %}
     _gaq.push(['_trackPageview']);
 
     {% if track_page_load_time %}
diff --git a/google_analytics/templatetags/analytics.py b/google_analytics/templatetags/analytics.py
index 1e34196..4c3f82b 100644
--- a/google_analytics/templatetags/analytics.py
+++ b/google_analytics/templatetags/analytics.py
@@ -40,23 +40,24 @@ def __init__(self, site=None, code=None, template_name='google_analytics/analyti
     def render(self, context):
         content = ''
         if self.site:
-            code_set = self.site.analytics_set.all()
-            if code_set:
-                code = code_set[0].analytics_code
-            else:
+            code = self.site.analytics
+            if not code:
                 return ''
         elif self.code:
-            code = self.code
+            code = type('Code', (object,), {
+                'analytics_code': self.code,
+                'analytics_domain': '',
+                'track_page_load': False
+            })()
         else:
             return ''
         
-        if code.strip() != '':
+        if code.analytics_code.strip() != '':
             t = loader.get_template(self.template_name)
             c = Context({
-                'analytics_code': code,
-                'track_page_load_time': getattr(settings,
-                                                "GOOGLE_ANALYTICS_TRACK_PAGE_LOAD_TIME",
-                                                False),
+                'analytics_code': code.analytics_code,
+                'analytics_domain': code.analytics_domain,
+                'track_page_load_time': code.track_page_load,
             })
             return t.render(c)
         else:

From 8eaa4015fad89f085e8381d5209d3c97782ba640 Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 13:25:58 +0100
Subject: [PATCH 4/6] Fixing for Analytics.DoesNotExist

---
 google_analytics/templatetags/analytics.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/google_analytics/templatetags/analytics.py b/google_analytics/templatetags/analytics.py
index 4c3f82b..c5bbb83 100644
--- a/google_analytics/templatetags/analytics.py
+++ b/google_analytics/templatetags/analytics.py
@@ -1,13 +1,12 @@
 from django import template
 from django.conf import settings
-from django.db import models
+from ..models import Analytics
 from django.contrib.sites.models import Site
 
 from django.template import Context, loader
 
 
 register = template.Library()
-Analytics = models.get_model('googleanalytics', 'analytics')
 
 def do_get_analytics(parser, token):
     contents = token.split_contents()
@@ -40,8 +39,11 @@ def __init__(self, site=None, code=None, template_name='google_analytics/analyti
     def render(self, context):
         content = ''
         if self.site:
-            code = self.site.analytics
-            if not code:
+            try:
+                code = self.site.analytics
+            except Analytics.DoesNotExist:
+                return ''
+            else:
                 return ''
         elif self.code:
             code = type('Code', (object,), {

From a55edd20f94e731c82971443d717040569e65718 Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 15:38:10 +0100
Subject: [PATCH 5/6] Removing unnecessary else branch.

---
 google_analytics/templatetags/analytics.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/google_analytics/templatetags/analytics.py b/google_analytics/templatetags/analytics.py
index c5bbb83..3bb78d4 100644
--- a/google_analytics/templatetags/analytics.py
+++ b/google_analytics/templatetags/analytics.py
@@ -21,6 +21,9 @@ def do_get_analytics(parser, token):
         raise template.TemplateSyntaxError, "%r cannot take more than one argument" % tag_name
    
     if not code:
+        import ipdb;
+
+        ipdb.set_trace()
         current_site = Site.objects.get_current()
     else:
         if not (code[0] == code[-1] and code[0] in ('"', "'")):
@@ -38,13 +41,15 @@ def __init__(self, site=None, code=None, template_name='google_analytics/analyti
         
     def render(self, context):
         content = ''
+        import ipdb;
+
+        ipdb.set_trace()
         if self.site:
             try:
                 code = self.site.analytics
             except Analytics.DoesNotExist:
                 return ''
-            else:
-                return ''
+
         elif self.code:
             code = type('Code', (object,), {
                 'analytics_code': self.code,

From 5bad1eb8847473ac9b8c28ec61df1cbea2405cb8 Mon Sep 17 00:00:00 2001
From: Viktor Nagy <viktor.nagy@gmail.com>
Date: Tue, 11 Feb 2014 15:41:20 +0100
Subject: [PATCH 6/6] removed ipdb calls

---
 google_analytics/templatetags/analytics.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/google_analytics/templatetags/analytics.py b/google_analytics/templatetags/analytics.py
index 3bb78d4..a795917 100644
--- a/google_analytics/templatetags/analytics.py
+++ b/google_analytics/templatetags/analytics.py
@@ -21,9 +21,6 @@ def do_get_analytics(parser, token):
         raise template.TemplateSyntaxError, "%r cannot take more than one argument" % tag_name
    
     if not code:
-        import ipdb;
-
-        ipdb.set_trace()
         current_site = Site.objects.get_current()
     else:
         if not (code[0] == code[-1] and code[0] in ('"', "'")):
@@ -41,9 +38,6 @@ def __init__(self, site=None, code=None, template_name='google_analytics/analyti
         
     def render(self, context):
         content = ''
-        import ipdb;
-
-        ipdb.set_trace()
         if self.site:
             try:
                 code = self.site.analytics