summaryrefslogtreecommitdiff
path: root/project/urls.py
diff options
context:
space:
mode:
authorAnoop Jacob Thomas2010-11-12 11:42:18 +0530
committerAnoop Jacob Thomas2010-11-12 11:42:18 +0530
commitd55a4bafa3e92cabb9cd382902f4e8b1f40a9c6e (patch)
tree87ae2dcf46eb7f0f6f7e8d3da4110a7796a20a0d /project/urls.py
parent2e426d850c3b053f4a16f418931315d71fe2909b (diff)
downloadscipycon-d55a4bafa3e92cabb9cd382902f4e8b1f40a9c6e.tar.gz
scipycon-d55a4bafa3e92cabb9cd382902f4e8b1f40a9c6e.tar.bz2
scipycon-d55a4bafa3e92cabb9cd382902f4e8b1f40a9c6e.zip
Made sprints page, tutorials page and conference schedule page.
Diffstat (limited to 'project/urls.py')
-rw-r--r--project/urls.py22
1 files changed, 15 insertions, 7 deletions
diff --git a/project/urls.py b/project/urls.py
index 9b6f208..5b8f844 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -106,12 +106,12 @@ urlpatterns += patterns('',
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 @@ urlpatterns += patterns('',
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