From 2f2c5cf19dbd376482cd878d2fcd4e8b815e8f41 Mon Sep 17 00:00:00 2001
From: Ismael Carnales <icarnales@gmail.com>
Date: Mon, 29 Dec 2008 18:27:16 +0000
Subject: [PATCH] removed django.contrib.comments requirement

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40574
---
 sites/scrapy.org/scrapyorg/blog/models.py        |  1 -
 sites/scrapy.org/scrapyorg/settings.py           |  1 -
 sites/scrapy.org/templates/blog/post_detail.html | 16 ++++++++++------
 sites/scrapy.org/templates/header.html           |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sites/scrapy.org/scrapyorg/blog/models.py b/sites/scrapy.org/scrapyorg/blog/models.py
index 24c6e448d..176f5d63c 100644
--- a/sites/scrapy.org/scrapyorg/blog/models.py
+++ b/sites/scrapy.org/scrapyorg/blog/models.py
@@ -42,7 +42,6 @@ class Post(models.Model):
     body            = models.TextField(_('body'))
     tease           = models.TextField(_('tease'), blank=True)
     status          = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2)
-    allow_comments  = models.BooleanField(_('allow comments'), default=True)
     publish         = models.DateTimeField(_('publish'))
     created         = models.DateTimeField(_('created'), auto_now_add=True)
     modified        = models.DateTimeField(_('modified'), auto_now=True)
diff --git a/sites/scrapy.org/scrapyorg/settings.py b/sites/scrapy.org/scrapyorg/settings.py
index 817b820b7..f38c24d05 100644
--- a/sites/scrapy.org/scrapyorg/settings.py
+++ b/sites/scrapy.org/scrapyorg/settings.py
@@ -77,7 +77,6 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.markup',
-    'django.contrib.comments',
     'scrapyorg.article',
     'scrapyorg.download',
     'scrapyorg.docs',
diff --git a/sites/scrapy.org/templates/blog/post_detail.html b/sites/scrapy.org/templates/blog/post_detail.html
index 15bcbb2c1..3df6fd644 100644
--- a/sites/scrapy.org/templates/blog/post_detail.html
+++ b/sites/scrapy.org/templates/blog/post_detail.html
@@ -6,7 +6,12 @@
 {% block body_id %}post_{{ object.id }}{% endblock %}
 
 
-{% block main-content_title %}
+{% block content_title %}
+{% endblock %}
+
+
+{% block main-content %}
+  {% load blog markup %}
   <h2>{{ object.title }}</h2>
   <p class="other_posts">
     {% if object.get_previous_by_publish %}
@@ -16,13 +21,9 @@
     | <a class="next" href="{{ object.get_next_post.get_absolute_url }}">{{ object.get_next_post }} &raquo;</a> 
     {% endif %}
   </p>
-{% endblock %}
 
-
-{% block main-content %}
-  {% load blog markup comments %}
   {% comment %}
-  {% load tagging_tags %}
+  {% load comments tagging_tags %}
   {% endcomment %}
   
   <p class="date">{{ object.publish|date:"j F Y" }}</p>
@@ -42,6 +43,8 @@
   {% endif %}
   {% endcomment %}
   
+  
+  {% comment %}
   {% get_comment_list for object as comment_list %}
   {% if comment_list %}
   <div id="comments">
@@ -69,4 +72,5 @@
       <p>Comments have been close for this post.</p>
     </div>
   {% endif %}
+  {% endcomment %}
 {% endblock %}
diff --git a/sites/scrapy.org/templates/header.html b/sites/scrapy.org/templates/header.html
index ab5c63100..d2bc6cb08 100644
--- a/sites/scrapy.org/templates/header.html
+++ b/sites/scrapy.org/templates/header.html
@@ -7,7 +7,7 @@
     <li><a href="/docs/">Documentation</a></li>
     <li><a href="/community/">Community</a></li>
     <li><a href="http://dev.scrapy.org">Development</a></li>
-    <li class="last"><a href="/blog/">Blog</a></li>
+    <li class="last"><a href="/news/">news</a></li>
   </ul>
   <br class="clear"/>
 </div>