summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/base_urls.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index c533d44..eeb62ff 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -3,8 +3,8 @@ from django.contrib import admin
from django.views.generic import TemplateView
from django.conf import settings
-from blog.models import BlogSitemap, LatestFull
-from blog.views import HomepageList
+from jrnl.models import BlogSitemap, LatestFull
+from jrnl.views import HomepageList
from locations.models import WritingbyCountrySitemap
from links.models import LatestLinks
from photos.models import PhotoGallerySitemap
@@ -51,11 +51,8 @@ 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('blog.urls')),
+ (r'^jrnl/', include('jrnl.urls', namespace='jrnl')),
(r'^projects/', include('projects.urls')),
- #Entry detail i.e. /year/month/day/my-title/
- #old: (r'(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', 'blog.views.entry_detail'),
- # locations
(r'^locations/', include('locations.urls')),
(r'^expenses/', include('expenses.urls')),
(r'^photos/', include('photos.urls')),
@@ -66,11 +63,7 @@ urlpatterns += patterns('',
(r'^travel-guide/', include('guide.urls')),
(r'^src/', include('src.urls')),
(r'^figments/', include('figments.urls')),
- # map
(r'^map/', include('locations.urls')),
- #about
- #(r'^about/$', 'blog.views.about'), #'blog.views.home'),
- #homepage
url(
regex=r'^$',
view=HomepageList.as_view(),