summaryrefslogtreecommitdiff
path: root/config/base_urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'config/base_urls.py')
-rw-r--r--config/base_urls.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index 9104d6e..b5751f0 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -5,6 +5,7 @@ from django.conf import settings
from django.contrib.sitemaps.views import sitemap
from pages.views import page
+from pages.views import PageDetailView
from jrnl.models import BlogSitemap
from jrnl.views import HomepageList
from locations.models import WritingbyCountrySitemap
@@ -58,14 +59,8 @@ urlpatterns += [
),
url(r'^travel-guide/', include('guide.urls')),
url(r'^src/', include('src.urls', namespace='src')),
- url(
- r'^figments/',
- include('figments.urls', namespace='figments')
- ),
- url(
- r'^resume/',
- include('resume.urls', namespace='resume')
- ),
+ url(r'^figments/', include('figments.urls', namespace='figments')),
+ url(r'^resume/', include('resume.urls', namespace='resume')),
url(r'^map', include('locations.urls')),
url(
r'^$',
@@ -73,7 +68,8 @@ urlpatterns += [
name="homepage"
),
# pages
- url(r'^(?P<slug>[-\w]+)/?$', page),
+ url(r'^(?P<slug>[-\w]+)/?$', PageDetailView.as_view()),
+ url(r'^(?P<path>[-\w]+)/(?P<slug>[-\w]+)?$', PageDetailView.as_view()),
]
urlpatterns += [