summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authoretienne2008-12-05 00:16:29 +0000
committeretienne2008-12-05 00:16:29 +0000
commitaedea8f1939ae9f894670b461abea9bea1be092e (patch)
treed65caa6dd02ca3a0ecb9db5377f64db861f6d684 /urls.py
parent34298e230277a8cc7a1a67f7e23e01768668142d (diff)
Public votes - Polls categories
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py10
1 files changed, 7 insertions, 3 deletions
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>.*)$',