sql/001_newcomments_migration.sql templates/comments/form.html templates/comments/preview.html @@ -7,7 +7,6 @@ from django.utils.translation import ugettext_lazy as _ from tagging.models import Tag from tagging.fields import TagField -from comment_utils.moderation import CommentModerator, moderator class PostManager(models.Manager): def active(self): @@ -40,7 +39,3 @@ class Post(models.Model): "slug": self.slug, }) get_absolute_url = models.permalink(get_absolute_url) - -class PostModerator(CommentModerator): - akismet = True -moderator.register(Post, PostModerator) blog/models.py @@ -78,7 +78,6 @@ INSTALLED_APPS = ( "oebfare.aggregator", "tagging", - "comment_utils", "django.contrib.admin", "django.contrib.auth", conf/global_settings.py @@ -1,9 +1,9 @@ {% load tagging_tags %} {% load blog_utils %} -{% load moderated_comments %} +{% load comments %} <div id="entry_{{ post.pk }}" class="entry-brief{% if last %} entry-last{% endif %}"> <h2><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h2> - {% get_public_free_comment_count for blog.post post.pk as comment_count %} + {% get_comment_count for post as comment_count %} <div class="published small">Published {{ post.pub_date|date:"M j, Y" }} at {{ post.pub_date|time:"f A" }}. <a href="{{ post.get_absolute_url }}#c">{{ comment_count }} comment{{ comment_count|pluralize }}</a></div> <p>{% if can_edit %}<a href="/admin/blog/post/{{ post.pk }}/">Edit Post</a> | {% endif %}<a href="{{ post.get_absolute_url }}">Read Full Entry ...</a></p> {% tags_for_object post as tags %} templates/blog/post_brief.html @@ -11,22 +11,21 @@ <hr /> -{% load moderated_comments %} {% load comments %} -{% get_public_free_comment_list for blog.post post.pk as comment_list %} +{% get_comment_list for post as comment_list %} {% if comment_list %} <h2 id="c">Comments</h2> {% for comment in comment_list %} <div class="comment" id="c{{ comment.pk }}"> <div class="{% cycle odd,even %}"> {{ comment.comment|urlizetrunc:"40"|linebreaks }} - <p class="small">Posted by <strong>{{ comment.person_name }}</strong> on <strong>{{ comment.submit_date|date:"M j, Y" }}</strong> at <strong>{{ comment.submit_date|time:"f A" }}</strong></p> + <p class="small">Posted by <strong>{{ comment.user_name }}</strong> on <strong>{{ comment.submit_date|date:"M j, Y" }}</strong> at <strong>{{ comment.submit_date|time:"f A" }}</strong></p> </div> </div> {% endfor %} {% endif %} <h2>Add Your Comment</h2> -{% free_comment_form for blog.post post.pk %} +{% render_comment_form for post %} {% endblock %} {% block sr %} templates/blog/post_detail.html @@ -14,7 +14,7 @@ urlpatterns = patterns("", }), url(r"^admin/(.*)", admin.site.root), url(r"^blog/", include("oebfare.blog.urls")), - url(r"^comments/", include("django.contrib.comments.urls.comments")), + url(r"^comments/", include("django.contrib.comments.urls")), url(r"^links/", include("oebfare.links.urls")), url(r"^$", "oebfare.blog.views.homepage", name="oebfare_home"), ) urls.py templates/comments/free_preview.html templates/comments/freeform.html 3c2085117d7c323e43ac15ce35c152d1094dd30c brosner brosner@gmail.com http://github.com/brosner/oebfare/commit/a411cc372e038eb7de2d023a34b53e802dd56a8f a411cc372e038eb7de2d023a34b53e802dd56a8f 2008-09-16T12:17:56-07:00 2008-09-16T12:17:56-07:00 Initial update to 1.0 compatibility. Fixed comments. 9743dc3c0826ac7c7f9be569f915d7efd1946e1e brosner brosner@gmail.com