From 8944ff3fba186e71a7349c1a06153f32650e77d4 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 21 May 2012 22:17:25 +0200 Subject: Remove comments It was interesting to see, but I (personally) really don't need comments, someone else could still use it. --- aggregator/feeds.py | 21 --------------------- settings.py | 1 - static/comments.css | 16 ---------------- templates/aggregator/post_detail.html | 12 ------------ urls.py | 8 +++----- 5 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 static/comments.css diff --git a/aggregator/feeds.py b/aggregator/feeds.py index 3274ba3..75e5d4f 100644 --- a/aggregator/feeds.py +++ b/aggregator/feeds.py @@ -1,5 +1,4 @@ from django.contrib.syndication.views import Feed -from django.contrib.comments.models import Comment from .models import Post @@ -22,23 +21,3 @@ class LatestPostsFeed(Feed): def item_pubdate(self, item): return item.updated - -class LatestCommentsFeed(Feed): - title = "ryuslash's latest comments" - link = "/" - description = "Comments on posts" - - def items(self): - return Comment.objects.all() - - def item_title(self, item): - return 'Comment for %s' % item.content_object.title - - def item_description(self, item): - return item.comment - - def item_link(self, item): - return "/post/%s/" % item.object_pk - - def item_pubdate(self, item): - return item.submit_date diff --git a/settings.py b/settings.py index 12ebdc5..5773145 100644 --- a/settings.py +++ b/settings.py @@ -113,7 +113,6 @@ TEMPLATE_DIRS = ( INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.sessions', - 'django.contrib.comments', 'django.contrib.staticfiles', 'aggregator', 'south') diff --git a/static/comments.css b/static/comments.css deleted file mode 100644 index b136c15..0000000 --- a/static/comments.css +++ /dev/null @@ -1,16 +0,0 @@ -#comments, form { - background-color: #808080; - padding: 5px; - border: 1px #505050 solid; - margin-bottom: 15px; - color: #000000; -} - -#comments dd { - margin-left: 40px; - margin-bottom: 15px; -} - -form label { - display: block; -} diff --git a/templates/aggregator/post_detail.html b/templates/aggregator/post_detail.html index 574d9b1..eb39f95 100644 --- a/templates/aggregator/post_detail.html +++ b/templates/aggregator/post_detail.html @@ -1,20 +1,8 @@ {% extends "aggregator/base.html" %} -{% load comments %} - -{% block head %} - -{% endblock %} {% block content %} {% include "aggregator/post_content.html" with post=object %} -{% get_comment_count for object as comment_count %} -{% if comment_count > 0 %} - {% render_comment_list for object %} -{% endif %} - -{% render_comment_form for object %} -
{% with next=object.get_next_by_updated previous=object.get_previous_by_updated %} {% if previous %} diff --git a/urls.py b/urls.py index d3248a9..7cba6ae 100644 --- a/urls.py +++ b/urls.py @@ -1,16 +1,14 @@ -from django.conf.urls.defaults import patterns, url, include +from django.conf.urls.defaults import patterns, url from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.views.generic import DetailView from aggregator.models import Post -from aggregator.feeds import LatestPostsFeed, LatestCommentsFeed +from aggregator.feeds import LatestPostsFeed urlpatterns = patterns('', url(r'^post/(?P\d+)/$', DetailView.as_view(model=Post)), url(r'^((?P[a-z_-]+)/)?((?P\d+)/)?$', 'aggregator.views.posts'), - url(r'^feed/posts/$', LatestPostsFeed()), - url(r'^feed/comments/$', LatestCommentsFeed()), - url(r'^comments/', include('django.contrib.comments.urls'))) + url(r'^feed/posts/$', LatestPostsFeed())) urlpatterns += staticfiles_urlpatterns() -- cgit v1.2.3-54-g00ecf