summaryrefslogtreecommitdiff
path: root/project/urls.py
diff options
context:
space:
mode:
authorMadhusudan.C.S2010-07-13 23:40:34 +0530
committerMadhusudan.C.S2010-07-13 23:40:34 +0530
commitd5fbda31f85176ccfd0a5e49561f1180a998df16 (patch)
tree9ba55c865fb15d3cdd67bf65d9e2308d51d66c69 /project/urls.py
parent3ec894e684c645876402a9cac912d98b5ed06c37 (diff)
downloadscipycon-d5fbda31f85176ccfd0a5e49561f1180a998df16.tar.gz
scipycon-d5fbda31f85176ccfd0a5e49561f1180a998df16.tar.bz2
scipycon-d5fbda31f85176ccfd0a5e49561f1180a998df16.zip
Removed unwanted files and made more changes to make SciPyCon a clean app.
Diffstat (limited to 'project/urls.py')
-rw-r--r--project/urls.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/project/urls.py b/project/urls.py
index 2db1513..10e29b4 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -6,20 +6,11 @@ from django.contrib import admin
from django.views.generic.simple import direct_to_template
from django.conf.urls.defaults import *
-#basic.blog
-from basic.blog.feeds import BlogPostsFeed
-
-feeds = {
- 'blog': BlogPostsFeed,
- }
-
admin.autodiscover()
-# Blog & Admin
-urlpatterns = patterns(
- '',
+# Admin
+urlpatterns = patterns('',
url(r'^$', direct_to_template, {"template": "home.html"}, name='home'),
- (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^comments/', include('django.contrib.comments.urls')),
(r'^admin/(.*)', admin.site.root),
)
@@ -92,12 +83,11 @@ urlpatterns += patterns('',
url(r'^talks-cfp/speakers/$',
direct_to_template, {"template": "talk/speakers.html"},
name='scipycon_speakers'),
- (r'^accounts/', include('registration.urls')),
)
# Password reset
urlpatterns += patterns('django.contrib.auth.views',
- url(r'^password-reset/$', 'password_reset', name='kiwipycon_password_reset'),
+ url(r'^password-reset/$', 'password_reset', name='scipycon_password_reset'),
url(r'^password-reset-done/$', 'password_reset_done'),
url(r'^password-reset-confirm/(?P<uidb36>[-\w]*)/(?P<token>[-\w]*)$', 'password_reset_confirm'),
url(r'^password-reset-complete/$', 'password_reset_complete'),