summaryrefslogtreecommitdiff
path: root/scannerjammer/urls.py
diff options
context:
space:
mode:
authorroot <root@lalalizard.com>2012-12-16 14:07:51 -0500
committerroot <root@lalalizard.com>2012-12-16 14:07:51 -0500
commit9b88fff43a091872b7f7d80cd97128b3e57076f3 (patch)
tree19261db1bcad63e0983367da55b5c807630139d2 /scannerjammer/urls.py
parentb1c0b2a7fcf808a4321ca4c5daaf14ba4055165b (diff)
Calendar handler
Diffstat (limited to 'scannerjammer/urls.py')
-rw-r--r--scannerjammer/urls.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py
index f80d875..1b3648d 100644
--- a/scannerjammer/urls.py
+++ b/scannerjammer/urls.py
@@ -21,12 +21,14 @@ urlpatterns = patterns('',
url(r'^api/', include('backend.urls')),
# Frontend
- url(r'^backgrounds/$', 'frontend.views.bg', name='bg'),
- url(r'^top/$', 'frontend.views.topvideos', name='topvideos'),
- url(r'^directory/$', 'frontend.views.directory', name='directory'),
+ url(r'^backgrounds/?$', 'frontend.views.bg', name='bg'),
+ url(r'^top/?$', 'frontend.views.topvideos', name='topvideos'),
+ url(r'^directory/?$', 'frontend.views.directory', name='directory'),
+ url(r'^faq/?$', 'frontend.views.faq', name='faq'),
+ url(r'^calendar/?$', 'frontend.views.calendar', name='calendar'),
url(r'^profile/(?P<username>[a-z0-9_]+)$', 'frontend.views.profile', name='profile'),
+ url(r'^(?P<roomname>avatar)/$', 'frontend.views.room', name='room'),
url(r'^(?P<roomname>[a-z0-9_]+)$', 'frontend.views.room', name='room'),
- url(r'^faq/$', 'frontend.views.faq', name='faq'),
#url(r'.*', 'backend.views.redirect'),
)