django_yaba/templatetags/get_setting.py @@ -11,3 +11,4 @@ db/ blog/fixtures django_yaba.egg-info dist +build .gitignore @@ -3,8 +3,6 @@ from tagging.fields import TagField from tagging.models import Tag from django.conf import settings from django.db.models.signals import post_save, pre_save -from django.contrib.comments.views import comments -from django_yaba.comments import wrapped_post_comment from django.db.models import permalink from django_yaba.fields import ThumbnailImageField from django.contrib.auth.models import User @@ -262,7 +260,6 @@ def config_name(sender, instance, created, **kwargs): "There can only be one configuration entry, \ thus only one theme. Sorry!") -comments.post_comment = wrapped_post_comment post_save.connect(config_name, sender=Configuration) post_save.connect(post_tweet, sender=Article) django_yaba/models.py @@ -32,8 +32,19 @@ <!-- stop social media --> <!-- start comments --> <hr /> -{% load disqus_tags %} -{% disqus_show_comments %} +{% load get_setting %} +{% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_list for posts as post_comments %} + {% for comment in post_comments %} + {{ comment }} + {% endfor %} + {% render_comment_form for posts %} + {% else %} + {% load disqus_tags %} + {% disqus_show_comments %} + {% endif %} <!-- end comments --> {% else %} <p> Sorry, nothing seems to exist here. Please try one of the many other links instead</p> django_yaba/templates/blog/article_detail.html @@ -51,8 +51,19 @@ <!-- stop social media --> <hr /> <!-- start comments --> -{% load disqus_tags %} -{% disqus_show_comments %} +{% load get_setting %} +{% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_list for posts as post_comments %} + {% for comment in post_comments %} + {{ comment }} + {% endfor %} + {% render_comment_form for posts %} + {% else %} + {% load disqus_tags %} + {% disqus_show_comments %} + {% endif %} <!-- end comments --> </div> {% endif %} django_yaba/templates/blog/gallery.html @@ -45,9 +45,17 @@ <hr /> <!-- stop social media --> <!-- start comments --> - {% load disqus_tags %} - <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> - {% disqus_num_replies %} + {% load get_setting %} + {% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_count for post as post_count %} + <a href="{{ post.get_absolute_url }}">{{ post_count }} Comments</a> + {% else %} + {% load disqus_tags %} + <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> + {% disqus_num_replies %} + {% endif %} <!-- end comments --> </div> <hr /> django_yaba/templates/blog/gallery_list.html @@ -31,8 +31,19 @@ <!-- stop social media --> <hr /> <!-- start comments --> - {% load disqus_tags %} -{% disqus_show_comments %} +{% load get_setting %} +{% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_list for posts as post_comments %} + {% for comment in post_comments %} + {{ comment }} + {% endfor %} + {% render_comment_form for posts %} + {% else %} + {% load disqus_tags %} + {% disqus_show_comments %} + {% endif %} <!-- end comments --> </div> {% endblock %} django_yaba/templates/blog/story_detail.html @@ -51,9 +51,17 @@ <hr /> <!-- stop social media --> <!-- start comments --> - {% load disqus_tags %} - <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> - {% disqus_num_replies %} + {% load get_setting %} + {% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_count for post as post_count %} + <a href="{{ post.get_absolute_url }}">{{ post_count }} Comments</a> + {% else %} + {% load disqus_tags %} + <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> + {% disqus_num_replies %} + {% endif %} <!-- end comments --> </div> <hr /> django_yaba/templates/blog/story_list.html @@ -53,9 +53,18 @@ <hr /> <!-- stop social media --> <!-- start comments --> - {% load disqus_tags %} - <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> - {% disqus_num_replies %} + {% load get_setting %} + {% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% get_comment_count for post as post_count %} + <a href="{{ post.get_absolute_url }}">{{ post_count }} Comments</a> + {% else %} + {% load disqus_tags %} + <a href="{{ post.get_absolute_url }}#disqus_thread">View Comments</a> + {% disqus_num_replies %} + {% endif %} + <!-- end comments --> </div> <hr /> django_yaba/templates/blog/story_search.html @@ -11,7 +11,13 @@ <link href="media/css/patch_layout.css" rel="stylesheet" type="text/css" /> <![endif]--> <script type="text/javascript" src="{{ MEDIA_URL }}js/slide.js"></script> - {% load disqus_tags %} +{% load get_setting %} +{% get_setting "DJANGO_COMMENTS" "django_comments" %} + {% if django_comments %} + {% load comments %} + {% else %} + {% load disqus_tags %} + {% endif %} </head> <body> django_yaba/templates/blog_base.html @@ -1,4 +1,5 @@ from django.conf.urls.defaults import * +from django.conf import settings from django.contrib.syndication.views import feed from django_yaba.models import Links from django_yaba.feeds import RSSFeed @@ -23,3 +24,8 @@ urlpatterns += patterns('', url(r'^feeds/(?P<url>.*)/$', feed, {'feed_dict': {'rss': RSSFeed}}), url(r'^links/$', 'links', {'link_dict': {'links': Links}}), ) + +if settings.DJANGO_COMMENTS: + urlpatterns += patterns('', + (r'^comments/', include('django.contrib.comments.urls')), + ) django_yaba/urls.py @@ -13,7 +13,7 @@ setup( author_email = "f4nt@f4ntasmic.com", url = "http://www.f4ntasmic.com", - packages = find_packages('src'), + packages = find_packages('.'), package_dir = {'':'.'}, data_files = media_files, package_data = { @@ -32,10 +32,7 @@ setup( 'python-twitter', 'twitter', 'simplejson', - 'Django', - 'South', 'feedparser', - 'django_test_extensions', 'django-disqus', 'django-tagging', ], setup.py django_yaba/captcha.py django_yaba/comments.py django_yaba/templates/comments/posted.html django_yaba/templates/comments/preview.html 6392ad0f3a6cb0219faff07bc918b50271be624b f4nt markr@imagescape.com http://github.com/f4nt/django-yaba/commit/06a15d7f4ba56415a2b7aea45c171254fac4b06a 06a15d7f4ba56415a2b7aea45c171254fac4b06a 2009-10-30T13:57:21-07:00 2009-10-30T13:57:21-07:00 adding the ability to use contrib.comments OR disqus based on a setting 5424a49280a41149b82c7c515719d39852e4c483 f4nt markr@imagescape.com