--- a/project/urls.py Thu Nov 11 18:57:49 2010 +0530
+++ b/project/urls.py Fri Nov 12 11:42:18 2010 +0530
@@ -106,12 +106,12 @@
url(r'^%s/talks-cfp/schedule/$' % (SCOPE_ARG_PATTERN),
direct_to_template, {"template": "talk/schedule.html"},
name='scipycon_schedule'),
- url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN),
- direct_to_template, {"template": "talk/tutorial-schedule.html"},
- name='scipycon_tutorial_schedule'),
- url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN),
- direct_to_template, {"template": "talk/sprint-schedule.html"},
- name='scipycon_sprint_schedule'),
+ # url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN),
+ # direct_to_template, {"template": "talk/tutorial-schedule.html"},
+ # name='scipycon_tutorial_schedule'),
+ # url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN),
+ # direct_to_template, {"template": "talk/sprint-schedule.html"},
+ # name='scipycon_sprint_schedule'),
url(r'^%s/talks-cfp/speakers/$' % (SCOPE_ARG_PATTERN),
direct_to_template, {"template": "talk/speakers.html"},
name='scipycon_speakers'),
@@ -124,7 +124,15 @@
url(r'^%s/organizers/$' % (SCOPE_ARG_PATTERN),
direct_to_template, {"template": "about/organizers.html"},
name='scipycon_organizers'),
-
+ url(r'^%s/talks-cfp/conference/$' % (SCOPE_ARG_PATTERN),
+ direct_to_template, {"template": "talk/conf_schedule.html"},
+ name='scipycon_conference'),
+ url(r'^%s/tutorial/$' % (SCOPE_ARG_PATTERN),
+ direct_to_template, {"template": "about/tutorial.html"},
+ name='scipycon_tutorial'),
+ url(r'^%s/sprints/$' % (SCOPE_ARG_PATTERN),
+ direct_to_template, {"template": "about/sprints.html"},
+ name='scipycon_sprints'),
)
# Password reset