Gauges

2013-02-07 10:58:26 -05:00 · 2013-02-07 10:58:26 -05:00 · a7d4ba99df
parent 563a607998
commit a7d4ba99df
7 changed files with 139 additions and 104 deletions
--- a/accounts/migrations/0011_auto__add_field_userprofile_gauges_site_id.py
+++ b/accounts/migrations/0011_auto__add_field_userprofile_gauges_site_id.py
@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'UserProfile.gauges_site_id'
+        db.add_column('accounts_userprofile', 'gauges_site_id',
+                      self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'UserProfile.gauges_site_id'
+        db.delete_column('accounts_userprofile', 'gauges_site_id')
+
+
+    models = {
+        'accounts.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'blog_domain': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'blog_theme': ('django.db.models.fields.CharField', [], {'default': "'D'", 'max_length': '1'}),
+            'blog_title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'default_editor': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '250'}),
+            'disqus_shortname': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'editor_theme': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '250'}),
+            'gauges_site_id': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'gittip_username': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'google_analytics_tracking_id': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_pro': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'stripe_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['accounts']
--- a/accounts/models.py
+++ b/accounts/models.py
@ -46,5 +46,6 @@ class UserProfile(models.Model):
    gittip_username  = models.CharField(max_length=250, null=True, blank=True)
    disqus_shortname = models.CharField(max_length=250, null=True, blank=True)
    google_analytics_tracking_id = models.CharField(max_length=250, null=True, blank=True)
+    gauges_site_id   = models.CharField(max_length=250, null=True, blank=True)

 User.profile = property(lambda u: UserProfile.objects.get_or_create(user=u)[0])
--- a/accounts/templates/account.html
+++ b/accounts/templates/account.html
@ -77,6 +77,13 @@
                        <span class="help-block">If you'd like to track visits to your blog site with <a href="http://analytics.google.com">Google Analytics</a>, enter your tracking ID here.</span>
                    </div>
                </div>
+                <div class="control-group">
+                    <label class="control-label" for="id_gauges_site_id">Gauges site ID:</label>
+                    <div class="controls">
+                        {{ form.id_gauges_site_id }}
+                        <span class="help-block">If you'd like to track visits to your blog site with <a href="http://get.gaug.es/">Gauges</a>, enter your site ID here.</span>
+                    </div>
+                </div>
                <div class="form-actions">
                    <button type="submit" class="btn btn-success">Save</button>
                </div>
--- a/accounts/views.py
+++ b/accounts/views.py
@ -31,6 +31,7 @@ def account(request):
            'gittip_username': profile.gittip_username,
            'disqus_shortname': profile.disqus_shortname,
            'google_analytics_tracking_id': profile.google_analytics_tracking_id,
+            'gauges_site_id': profile.gauges_site_id,
        })

    return {
--- a/blogs/templates/blogs/themes/pro-adams/base.html
+++ b/blogs/templates/blogs/themes/pro-adams/base.html
@ -107,58 +107,7 @@
    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
    <script type="text/javascript" src="{{ STATIC_URL }}js/pro.js?1"></script>

-    {% if not debug %}
-        <script type="text/javascript">
-            var _gauges = _gauges || [];
-            (function() {
-                var t   = document.createElement('script');
-                t.type  = 'text/javascript';
-                t.async = true;
-                t.id    = 'gauges-tracker';
-                t.setAttribute('data-site-id', '4ed65ee7f5a1f530f1000001');
-                t.src = '//secure.gaug.es/track.js';
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(t, s);
-            })();
-        </script>
-        <script type="text/javascript">
-            var _gaq = _gaq || [];
-            _gaq.push(['_setAccount', 'UA-514462-44']);
-            _gaq.push(['_trackPageview']);
-            (function() {
-                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-            })();
-        </script>
-        {% if blog_user.profile.google_analytics_tracking_id %}
-            <script type="text/javascript">
-                var _gaq = _gaq || [];
-                _gaq.push(['_setAccount', '{{ blog_user.profile.google_analytics_tracking_id }}']);
-                _gaq.push(['_trackPageview']);
-                (function() {
-                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                })();
-            </script>
-        {% endif %}
-        {% if blog_user.profile.gauges_site_id %}
-            <script type="text/javascript">
-                var _gauges = _gauges || [];
-                (function() {
-                    var t   = document.createElement('script');
-                    t.type  = 'text/javascript';
-                    t.async = true;
-                    t.id    = 'gauges-tracker';
-                    t.setAttribute('data-site-id', '{{ blog_user.profile.gauges_site_id }}');
-                    t.src = '//secure.gaug.es/track.js';
-                    var s = document.getElementsByTagName('script')[0];
-                    s.parentNode.insertBefore(t, s);
-                })();
-            </script>
-        {% endif %}
-    {% endif %}
+    {% include 'analytics.html' %}

 </body>
 </html>
--- a/templates/analytics.html
+++ b/templates/analytics.html
@ -0,0 +1,51 @@
+{% if not debug %}
+
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-514462-44']);
+        _gaq.push(['_trackPageview']);
+
+        {% if blog_user.profile.google_analytics_tracking_id %}
+            _gaq.push(['b._setAccount', '{{ blog_user.profile.google_analytics_tracking_id }}']);
+            _gaq.push(['b._trackPageview']);
+        {% endif %}
+
+        (function() {
+            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+
+    </script>
+
+    <script type="text/javascript">
+        var _gauges = _gauges || [];
+        (function() {
+            var t   = document.createElement('script');
+            t.type  = 'text/javascript';
+            t.async = true;
+            t.id    = 'gauges-tracker';
+            t.setAttribute('data-site-id', '4ed65ee7f5a1f530f1000001');
+            t.src = '//secure.gaug.es/track.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(t, s);
+        })();
+    </script>
+    {% if blog_user.profile.gauges_site_id %}
+        <script type="text/javascript">
+            var _gauges = _gauges || [];
+            (function() {
+                var t   = document.createElement('script');
+                t.type  = 'text/javascript';
+                t.async = true;
+                t.id    = 'gauges-tracker';
+                t.setAttribute('data-site-id', '{{ blog_user.profile.gauges_site_id }}');
+                t.src = '//secure.gaug.es/track.js';
+                var s = document.getElementsByTagName('script')[0];
+                s.parentNode.insertBefore(t, s);
+            })();
+        </script>
+    {% endif %}
+
+{% endif %}
--- a/templates/base.html
+++ b/templates/base.html
@ -411,58 +411,7 @@
        {% endif %}
    {% endif %}

-    {% if not debug %}
-        <script type="text/javascript">
-            var _gauges = _gauges || [];
-            (function() {
-                var t   = document.createElement('script');
-                t.type  = 'text/javascript';
-                t.async = true;
-                t.id    = 'gauges-tracker';
-                t.setAttribute('data-site-id', '4ed65ee7f5a1f530f1000001');
-                t.src = '//secure.gaug.es/track.js';
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(t, s);
-            })();
-        </script>
-        <script type="text/javascript">
-            var _gaq = _gaq || [];
-            _gaq.push(['_setAccount', 'UA-514462-44']);
-            _gaq.push(['_trackPageview']);
-            (function() {
-                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-            })();
-        </script>
-        {% if blog_user.profile.google_analytics_tracking_id %}
-            <script type="text/javascript">
-                var _gaq = _gaq || [];
-                _gaq.push(['_setAccount', '{{ blog_user.profile.google_analytics_tracking_id }}']);
-                _gaq.push(['_trackPageview']);
-                (function() {
-                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                })();
-            </script>
-        {% endif %}
-        {% if blog_user.profile.gauges_site_id %}
-            <script type="text/javascript">
-                var _gauges = _gauges || [];
-                (function() {
-                    var t   = document.createElement('script');
-                    t.type  = 'text/javascript';
-                    t.async = true;
-                    t.id    = 'gauges-tracker';
-                    t.setAttribute('data-site-id', '{{ blog_user.profile.gauges_site_id }}');
-                    t.src = '//secure.gaug.es/track.js';
-                    var s = document.getElementsByTagName('script')[0];
-                    s.parentNode.insertBefore(t, s);
-                })();
-            </script>
-        {% endif %}
-    {% endif %}
+    {% include 'analytics.html' %}

    <div class="hidden">
        <img src="{{ STATIC_URL }}images/header-fixed-save.gif" alt="" />