From b6ec26d428b6b95557ae0f97c3d42cb7e8222968 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Sat, 2 Feb 2013 23:01:34 -0500 Subject: [PATCH] Re-enable Disqus comments on blogs, with option to use custom Disqus shortname. For #52 --- ..._add_field_userprofile_disqus_shortname.py | 73 +++++++++++++++++++ accounts/models.py | 4 +- accounts/templates/account.html | 20 +++-- accounts/views.py | 6 +- .../templates/blogs/themes/default/list.html | 8 +- .../templates/blogs/themes/default/post.html | 8 +- .../blogs/themes/pro-adams/list.html | 4 +- .../blogs/themes/pro-adams/snipt-list.html | 4 +- 8 files changed, 97 insertions(+), 30 deletions(-) create mode 100644 accounts/migrations/0007_auto__add_field_userprofile_disqus_shortname.py diff --git a/accounts/migrations/0007_auto__add_field_userprofile_disqus_shortname.py b/accounts/migrations/0007_auto__add_field_userprofile_disqus_shortname.py new file mode 100644 index 0000000..7a378c9 --- /dev/null +++ b/accounts/migrations/0007_auto__add_field_userprofile_disqus_shortname.py @@ -0,0 +1,73 @@ +# -*- 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.disqus_shortname' + db.add_column('accounts_userprofile', 'disqus_shortname', + self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'UserProfile.disqus_shortname' + db.delete_column('accounts_userprofile', 'disqus_shortname') + + + 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'}), + 'disqus_shortname': ('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'}), + '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'] \ No newline at end of file diff --git a/accounts/models.py b/accounts/models.py index bac0d2d..8e8579e 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -12,9 +12,11 @@ class UserProfile(models.Model): is_pro = models.BooleanField(default=False) stripe_id = models.CharField(max_length=100, null=True, blank=True) - gittip_username = models.CharField(max_length=250, null=True, blank=True) blog_title = models.CharField(max_length=250, null=True, blank=True) blog_theme = models.CharField(max_length=1, null=False, blank=False, default='D', choices=THEME_CHOICES) blog_domain = models.CharField(max_length=250, null=True, blank=True) + gittip_username = models.CharField(max_length=250, null=True, blank=True) + disqus_shortname = models.CharField(max_length=250, null=True, blank=True) + User.profile = property(lambda u: UserProfile.objects.get_or_create(user=u)[0]) diff --git a/accounts/templates/account.html b/accounts/templates/account.html index c1995bb..971c9c9 100644 --- a/accounts/templates/account.html +++ b/accounts/templates/account.html @@ -25,13 +25,6 @@ {% if request.user.profile.is_pro %}
Edit Pro settings -
- -
- {{ form.gittip_username }} - Your GitTip username, if you have one. -
-
@@ -51,6 +44,19 @@ Like 'snipt.nicksergeant.com' or 'nicksergeant.com' (without quotes). Set your CNAME / A-record to point to 96.126.110.160
+
+ +
+ {{ form.gittip_username }} + Your GitTip username, if you have one. +
+
+
+ +
+ {{ form.disqus_shortname }} +
+
diff --git a/accounts/views.py b/accounts/views.py index be390e4..b36ec07 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -21,10 +21,12 @@ def account(request): profile = request.user.profile form = AccountForm(initial={ - 'gittip_username': profile.gittip_username, 'blog_title': profile.blog_title, 'blog_theme': profile.blog_theme, - 'blog_domain': profile.blog_domain + 'blog_domain': profile.blog_domain, + + 'gittip_username': profile.gittip_username, + 'disqus_shortname': profile.disqus_shortname, }) return { diff --git a/blogs/templates/blogs/themes/default/list.html b/blogs/templates/blogs/themes/default/list.html index 3d75c23..94da03c 100644 --- a/blogs/templates/blogs/themes/default/list.html +++ b/blogs/templates/blogs/themes/default/list.html @@ -21,13 +21,8 @@ {% endfor %} {% paginate %} - {% comment %} - {% endcomment %} {% endblock %} diff --git a/blogs/templates/blogs/themes/default/post.html b/blogs/templates/blogs/themes/default/post.html index c306e07..266a3ca 100644 --- a/blogs/templates/blogs/themes/default/post.html +++ b/blogs/templates/blogs/themes/default/post.html @@ -18,14 +18,9 @@ {% with 'true' as detail %} {% include "blogs/themes/default/snipt-list.html" %} {% endwith %} - {% comment %}
- {% endcomment %} {% endblock %} diff --git a/blogs/templates/blogs/themes/pro-adams/list.html b/blogs/templates/blogs/themes/pro-adams/list.html index e6de0aa..9d9b873 100644 --- a/blogs/templates/blogs/themes/pro-adams/list.html +++ b/blogs/templates/blogs/themes/pro-adams/list.html @@ -10,9 +10,8 @@ {% include "blogs/themes/pro-adams/snipt-list.html" %} {% endfor %} {% paginate %} - {% comment %} - {% endcomment %} {% endblock %} diff --git a/blogs/templates/blogs/themes/pro-adams/snipt-list.html b/blogs/templates/blogs/themes/pro-adams/snipt-list.html index 9d23042..dffe7fe 100644 --- a/blogs/templates/blogs/themes/pro-adams/snipt-list.html +++ b/blogs/templates/blogs/themes/pro-adams/snipt-list.html @@ -35,10 +35,9 @@ {% endif %} {% endif %} {% if detail %} - {% comment %}
- {% endcomment %} {% endif %}