whew artifact stuff, all basic style

1 files changed, 10 insertions, 2 deletions

diff --git a/bn_django/journal/urls.py b/bn_django/journal/urls.py
index 1730ac7..4267e17 100644
--- a/bn_django/journal/urls.py
+++ b/bn_django/journal/urls.py
@@ -1,12 +1,20 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 
-from models import Entry, MicroEntry, Artifact
+from models import Entry, MicroEntry
 
 urlpatterns = patterns('django.views.generic.list_detail',
 	(r'^$', 'object_list',
 		dict(queryset=Entry.objects.order_by('-date'),
         paginate_by=35, allow_empty=False)),
-	(r'^(?P<slug>[\d\w-]+)/$', 'object_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())),
 )