From aedea8f1939ae9f894670b461abea9bea1be092e Mon Sep 17 00:00:00 2001
From: etienne <etienne@07715635-78ed-41b0-aaf1-0afda6c37f35>
Date: Fri, 5 Dec 2008 00:16:29 +0000
Subject: Public votes - Polls categories

---
 urls.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 2234ab3..f4e5ec8 100644
--- a/urls.py
+++ b/urls.py
@@ -18,18 +18,22 @@
 # See the file COPYING for details.
 
 from django.conf.urls.defaults import *
+from django.contrib import admin
+admin.autodiscover()
+
 from polls.feeds import PollLatestEntries
 
 feeds = {
     'poll': PollLatestEntries,
 }
 
-
 urlpatterns = patterns('',
-     (r'^papillon/admin/', include('django.contrib.admin.urls')),
+     (r'^papillon/admin/(.*)', admin.site.root),
      (r'^papillon/$', 'papillon.polls.views.index'),
      (r'^papillon/edit/(?P<admin_url>\w+)/$',
-          'papillon.polls.views.createOrEdit'),
+            'papillon.polls.views.createOrEdit'),
+     (r'^papillon/category/(?P<category_id>\w+)/$',
+            'papillon.polls.views.category'),
      (r'^papillon/poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'),
      (r'^papillon/poll/(?P<poll_url>\w+)/vote$', 'papillon.polls.views.poll'),
      (r'^papillon/feeds/(?P<url>.*)$',
-- 
cgit v1.2.3