summaryrefslogtreecommitdiff
path: root/app/photos/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'app/photos/urls.py')
-rw-r--r--app/photos/urls.py32
1 files changed, 24 insertions, 8 deletions
diff --git a/app/photos/urls.py b/app/photos/urls.py
index 91aac41..7d074a9 100644
--- a/app/photos/urls.py
+++ b/app/photos/urls.py
@@ -1,11 +1,27 @@
-from django.conf.urls import *
+from django.conf.urls import url
from django.views.generic.base import RedirectView
+from . import views
-urlpatterns = patterns('',
- (r'data/(?P<slug>[-\w]+)/$', 'photos.views.photo_json'),
- (r'galleries/(?P<slug>[-\w]+)/$', 'photos.views.gallery'),
- (r'(?P<page>\d+)/$', 'photos.views.gallery_list'),
- (r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/photos/%(slug)s/1/", permanent=False)),
- (r'', RedirectView.as_view(url="/photos/1/", permanent=False)),
-)
+urlpatterns = [
+ url(
+ r'data/(?P<slug>[-\w]+)/$',
+ views.photo_json
+ ),
+ url(
+ r'galleries/(?P<slug>[-\w]+)/$',
+ views.gallery,
+ ),
+ url(
+ r'(?P<page>\d+)/$',
+ views.gallery_list,
+ ),
+ url(
+ r'(?P<slug>[-\w]+)/$',
+ RedirectView.as_view(url="/photos/%(slug)s/1/", permanent=False)
+ ),
+ url(
+ r'',
+ RedirectView.as_view(url="/photos/1/", permanent=False)
+ ),
+]