diff options
| author | Amit Sethi | 2010-11-18 01:29:38 +0530 |
|---|---|---|
| committer | Amit Sethi | 2010-11-18 01:29:38 +0530 |
| commit | ef30457a799ed882299d5730b3c52517c2662e68 (patch) | |
| tree | 7cf1d9fce4ecfee3c4b9467b861ff35e5306f2ce /project/urls.py | |
| parent | 6fd8bc041f4e6a0fcd2b2107b25abe33b4d52b79 (diff) | |
| parent | dffe9adba9c0dd2863faa6e6b3568b9405d3d32b (diff) | |
| download | scipycon-ef30457a799ed882299d5730b3c52517c2662e68.tar.gz scipycon-ef30457a799ed882299d5730b3c52517c2662e68.tar.bz2 scipycon-ef30457a799ed882299d5730b3c52517c2662e68.zip | |
Merging heads
Diffstat (limited to 'project/urls.py')
| -rw-r--r-- | project/urls.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/project/urls.py b/project/urls.py index 90e6c87..d955f87 100644 --- a/project/urls.py +++ b/project/urls.py @@ -108,12 +108,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'), @@ -126,6 +126,18 @@ 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'), + url(r'^%s/certificates/$' % (SCOPE_ARG_PATTERN), + direct_to_template, {"template": "about/certificates.html"}, + name='scipycon_certificates'), ) |