From c7b29da94d3b85ec91f0d5e2789db11a43473df5 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@eta.mit.edu>
Date: Sun, 1 Feb 2009 06:25:10 -0500
Subject: lots went on:  * rss feeds  * some admin interface stuff  * blah

running issues:
 * admin interface with model inheretence?
 * rss feeds: unicode cool?
 * proper year/month implementation (don't want day)
 * right side bar info
 * dating issue (datetime vs date)
---
 bn_django/journal/urls.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'bn_django/journal/urls.py')

diff --git a/bn_django/journal/urls.py b/bn_django/journal/urls.py
index 4267e17..4b50f40 100644
--- a/bn_django/journal/urls.py
+++ b/bn_django/journal/urls.py
@@ -2,6 +2,7 @@ from django.conf.urls.defaults import *
 from django.conf import settings
 
 from models import Entry, MicroEntry
+from feeds import feed_list
 
 urlpatterns = patterns('django.views.generic.list_detail',
 	(r'^$', 'object_list',
@@ -10,11 +11,31 @@ urlpatterns = patterns('django.views.generic.list_detail',
 	(r'^entries/$', 'object_list',
 		dict(queryset=Entry.objects.order_by('-date'),
         paginate_by=35, allow_empty=False)),
-	(r'^entries/(?P<slug>[\d\w-]+)/$', 'object_detail',
-		dict(queryset=Entry.objects.all(), slug_field='slug')),
 	(r'^microentries/$', 'object_list',
 		dict(queryset=MicroEntry.objects.order_by('-date'),
         paginate_by=35, allow_empty=False)),
 	(r'^microentries/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=MicroEntry.objects.all())),
+		dict(queryset=Entry.objects.order_by('-date'))),
+	(r'^entries/(?P<slug>[\d\w-]+)/$', 'object_detail',
+		dict(queryset=Entry.objects.order_by('-date'))),
 )
+
+urlpatterns += patterns('',
+    (r'^rss/(?P<url>.*)/$','django.contrib.syndication.views.feed',
+        {'feed_dict':feed_list})
+)
+
+#urlpatterns += patterns('django.views.generic.date_based',
+	#(r'^entries/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<slug>[\d\w-]+)/$', 'object_detail',
+		#dict(queryset=Entry.objects.all(), date_field='date')),
+	#(r'^entries/(?P<year>\d{4})/(?P<month>\d{2})/$', 'archive_month',
+		#dict(queryset=Entry.objects.all(), date_field='date')),
+	#(r'^entries/(?P<year>\d{4})/$', 'archive_year',
+		#dict(queryset=Entry.objects.all(), date_field='date')),
+	#(r'^microentries/(?P<year>\d{4])/(?P<month>\d{2})/(?P<day>\d{2})/(?P<object_id>\d+)/$', 'object_detail',
+		#dict(queryset=MicroEntry.objects.all())),
+	#(r'^microentries/(?P<year>\d{4})/(?P<month>\d{2})/$', 'archive_month',
+		#dict(queryset=MicroEntry.objects.all())),
+	#(r'^microentries/(?P<year>\d{4])/$', 'archive_year',
+		#dict(queryset=MicroEntry.objects.all())),
+#)
-- 
cgit v1.2.3