1.0

1 files changed, 6 insertions, 8 deletions

diff --git a/bn_django/urls.py b/bn_django/urls.py
index f37eca0..fa8b083 100644
--- a/bn_django/urls.py
+++ b/bn_django/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 from photos.models import Photo
-from django.contrib.comments.models import Comment,FreeComment
+from django.contrib.comments.models import Comment
 from django.contrib import admin
 import git_wiki.models
 
@@ -14,9 +14,7 @@ urlpatterns = patterns('',
         'latest_photos':Photo.objects.order_by('-date')[:2], \
         #'latest_comments':Photo.objects.order_by('date')[:4] \
         'latest_knowledge':git_wiki.models.shortlog(), \
-        'latest_comments':Comment.objects.order_by('-submit_date')[:4], \
-        'latest_freecomments': \
-            FreeComment.objects.order_by('-submit_date')[:4], \
+        'latest_comments':Comment.objects.order_by('-submit_date')[:8], \
         'newitems':git_wiki.models.newest_items(), \
         })}),
     (r'^about/$', 'django.views.generic.simple.direct_to_template', 
@@ -35,12 +33,12 @@ urlpatterns = patterns('',
     #(r'^code/', include('bn_django.git_browse.urls')),
     (r'^photos/', include('bn_django.photos.urls')),
     
-    (r'^search/', include('bn_django.search.urls')),
+    #(r'^search/', include('bn_django.search.urls')),
 
     # Uncomment this for admin:
-     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-     (r'^admin/(.*)', admin.site.root),
-     (r'^comments/', include('django.contrib.comments.urls.comments')),
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^admin/(.*)', admin.site.root),
+    (r'^comments/', include('django.contrib.comments.urls')),
 
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': '/home/bnewbold/bn-project/static',