summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2015-11-08 20:24:26 -0500
committerluxagraf <sng@luxagraf.net>2015-11-08 20:24:26 -0500
commit7e8fefe7f3c5aee31c4e7231e5fed21d34ed0cb6 (patch)
tree65eec2f77b579ad4127f8d7d9a799d9f3bcc6f4e /config
parent76c0bf31bf4a21fcf18df8579dbb6f660c4d7437 (diff)
Updated books app to use new CBVs and urls, also brought everything up
to PEP 8 styles
Diffstat (limited to 'config')
-rw-r--r--config/base_urls.py25
1 files changed, 20 insertions, 5 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index c47f5b5..e5aa79d 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -46,15 +46,30 @@ urlpatterns += patterns('',
(r'^googleb11655cd59dacf3c.html$', TemplateView.as_view(template_name='static/gverify.html')),
#(r'^contact/', TemplateView.as_view(template_name='details/contact.html')),
(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
- (r'^jrnl/', include('jrnl.urls', namespace='jrnl')),
+ url(
+ regex=r'^jrnl/',
+ view=include('jrnl.urls', namespace='jrnl')
+ ),
(r'^projects/', include('projects.urls')),
(r'^locations/', include('locations.urls')),
(r'^expenses/', include('expenses.urls')),
(r'^photos/', include('photos.urls')),
- (r'^books/', include('books.urls')),
- (r'^field-notes/', include('notes.urls')),
- (r'^photo/', include('photos.detail_urls')),
- (r'^birds/', include('birds.urls', namespace='birds')),
+ url(
+ regex=r'^books/',
+ view=include('books.urls', namespace='books')
+ ),
+ url(
+ regex=r'^field-notes/',
+ view=include('notes.urls', namespace='notes')
+ ),
+ url(
+ regex=r'^photo/',
+ view=include('photos.detail_urls', namespace='photos')
+ ),
+ url(
+ regex=r'^birds/',
+ view=include('birds.urls', namespace='birds')
+ ),
(r'^travel-guide/', include('guide.urls')),
(r'^src/', include('src.urls', namespace='src')),
(r'^figments/', include('figments.urls')),