@@ -5,7 +5,6 @@ Copyright (c) 2005 Dustin Sallings <dustin@spy.net> """ from django.contrib.syndication.feeds import Feed -from django.contrib.comments.feeds import LatestFreeCommentsFeed from rockstar.apps.blog.models import Post, Tag class Full(Feed): @@ -49,13 +48,3 @@ class Unreleased(Full): def items(self): return Post.objects.order_by('-post_date', '-id')[:10] - -class Comments(LatestFreeCommentsFeed): - title = "RockStarProgrammer Recent Comments" - description = "Recent comments at RockStarProgrammer" - - def item_author_name(self, item): - return item.person_name - - def item_pubdate(self, item): - return item.submit_date code/blogfeeds.py @@ -82,7 +82,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.flatpages', 'django.contrib.redirects', - 'django.contrib.comments', 'django.contrib.sitemaps', 'django.contrib.markup', 'rockstar.apps.blog', code/settings.py @@ -12,8 +12,7 @@ info_dict = { feeds = { 'full': blogfeeds.Full, 'summary': blogfeeds.Summary, - 'fullunreleased': blogfeeds.Unreleased, - 'comments': blogfeeds.Comments, + 'fullunreleased': blogfeeds.Unreleased } class SpecificPage(Sitemap): @@ -49,8 +48,6 @@ urlpatterns = patterns('', (r'^rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), - (r'^comments/', include('django.contrib.comments.urls.comments')), - (r'^all/', 'django.views.generic.date_based.archive_index', {'template_name': 'index.html', 'queryset': Post.objects.all(), 'date_field': 'post_date'}), code/urls.py @@ -13,8 +13,6 @@ title="RockStarProgrammer Blog" href="/rss/full/"/> <link rel="alternate" type="application/rss+xml" title="RockStarProgrammer Blog (summarized)" href="/rss/summary/"/> - <link rel="alternate" type="application/rss+xml" - title="Comments" href="/rss/comments/"/> <script type="text/javascript" src="http://public.west.spy.net/ufo.js"></script> <meta name="verify-v1" @@ -46,8 +44,6 @@ src="/media/img/rss-icon.png"/></a></li> <li><a href="/rss/summary/">summary <img alt="rss" src="/media/img/rss-icon.png"/></a></li> - <li><a href="/rss/comments/">comments <img - alt="rss" src="/media/img/rss-icon.png"/></a></li> <li><a href="pcast://www.rockstarprogrammer.org/rss/full/"><img alt="podcast" title="podcast" src="/media/img/podcast.png"/></a></li> </ul> @@ -84,5 +80,6 @@ google_color_url = "999999"; _uacct = "UA-679821-2"; urchinTracker(); </script> + {% block bottom %}{% endblock %} </body> </html> templates/base.html @@ -2,8 +2,6 @@ {% block extendedtitle %}Recent Posts{% endblock %} -{% load comments %} - {% block altnav %} <h1>Table of Contents</h1> <ul> @@ -28,8 +26,6 @@ {% for post in latest %} - {% get_free_comment_count for blog.post post.id as comment_count %} - <a name="post{{post.id}}"></a> <div class="blogentry {% if not post.released %}unreleased{% endif %}"> <div class="date">{{post.post_date}}</div> @@ -53,11 +49,26 @@ </div> {% endif %} <p class="postmeta"> - <a href="/post/{{post.post_date|date:"Y/M/d"|lower}}/{{post.slug}}/#comments"> - {{ comment_count }} comment{{ comment_count|pluralize }} - </a> + <a href="/post/{{post.post_date|date:"Y/M/d"|lower}}/{{post.slug}}/#disqus_thread">Comments</a> </p> </div> {% endfor %} {% endblock %} + +{% block bottom %} +<script type="text/javascript"> +//<![CDATA[ +(function() { + var links = document.getElementsByTagName('a'); + var query = '?'; + for(var i = 0; i < links.length; i++) { + if(links[i].href.indexOf('#disqus_thread') >= 0) { + query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&'; + } + } + document.write('<script type="text/javascript" src="http://disqus.com/forums/rsp/get_num_replies.js' + query + '"></' + 'script>'); + })(); +//]]> +</script> +{% endblock %} templates/index.html @@ -1,20 +1,6 @@ {% extends "base-extended.html" %} {% block extendedtitle %}{{object.title|safe}}{% endblock %} -{% load comments %} - -{% block extrastyle %} -<style type="text/css"> -.comment { -} -.commenttext { - font-size: smaller; - padding-left: 2em; - border-bottom: solid 1px; -} -</style> -{% endblock %} - {% block content %} <div class="blogentry {% if not object.released %}unreleased{% endif %}"> <div class="date">{{object.post_date}}</div> @@ -40,34 +26,10 @@ {% endif %} </div> -{% get_free_comment_list for blog.post object.id as comment_list %} - -<div id="commentContainer"> - -<h2><a name="comments">Comments</a></h2> - -{% for comment in comment_list %} -<div class="comment" id="c{{ comment.id }}"> - <h3><a name="c{{ comment.id }}">{{ comment.person_name }}, at - {{ comment.submit_date|date:"F j, Y" }} {{ comment.submit_date|date:"P" }}, - said:</a></h3> - <div class="commenttext"> - {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }} - </div> -</div> -{% endfor %} - -{% if object.comments_allowed %} -<h2>Post a Comment</h2> -<div id="commentform"> -{% free_comment_form for blog.post object.id %} -</div> -{% else %} - <div class="nocomments"> - New comments are not being accepted for this post. - </div> -{% endif %} - -</div> +<div id="disqus_thread"></div><script type="text/javascript" +src="http://disqus.com/forums/rsp/embed.js"></script><noscript><a +href="http://rsp.disqus.com/?url=ref">View the discussion +thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog +comments powered by <span class="logo-disqus">Disqus</span></a> {% endblock %} templates/post.html templates/comments/free_preview.html templates/comments/posted.html 0322eeeb44120dd3d1c0c4a7a67c67af0ee5d701 Dustin Sallings dustin@spy.net http://github.com/dustin/rsp/commit/0faeb42e5f18ada7bcdf1a9779ff9447ccbfabc3 0faeb42e5f18ada7bcdf1a9779ff9447ccbfabc3 2008-09-19T13:25:07-07:00 2008-09-19T13:25:07-07:00 Removed comment code, switched to disqus 66b12d7c9ddc2cea2b90102fb7ba1a8521a5c7c7 Dustin Sallings dustin@spy.net