13 files changed, 11 insertions, 16 deletions
diff --git a/app/figments/admin.py b/app/figments/admin.py
index f5e47a6..4c8127b 100644
--- a/app/figments/admin.py
+++ b/app/figments/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from .models import Figment, Series
-from blog.admin import BlogEntryForm
+from jrnl.admin import BlogEntryForm
 
 
 class FigmentAdmin(admin.ModelAdmin):
diff --git a/app/guide/models.py b/app/guide/models.py
index 9df83d3..4108e27 100644
--- a/app/guide/models.py
+++ b/app/guide/models.py
@@ -9,7 +9,7 @@ from PIL import Image
 import markdown
 from taggit.managers import TaggableManager
 from locations.models import Location
-from blog.models import Entry
+from jrnl.models import Entry
 from photos.models import PhotoGallery
 
 
diff --git a/app/blog/__init__.py b/app/jrnl/__init__.py
index e69de29..e69de29 100644
--- a/app/blog/__init__.py
+++ b/app/jrnl/__init__.py
diff --git a/app/blog/admin.py b/app/jrnl/admin.py
index 15a7512..15a7512 100644
--- a/app/blog/admin.py
+++ b/app/jrnl/admin.py
diff --git a/app/blog/fields.py b/app/jrnl/fields.py
index 8df2f5e..8df2f5e 100644
--- a/app/blog/fields.py
+++ b/app/jrnl/fields.py
diff --git a/app/blog/models.py b/app/jrnl/models.py
index 17f9f49..fe7f274 100644
--- a/app/blog/models.py
+++ b/app/jrnl/models.py
@@ -3,6 +3,7 @@ import os
 
 from django.contrib.gis.db import models
 from django.utils.html import format_html
+from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.syndication.views import Feed
 from django.contrib.sitemaps import Sitemap
@@ -92,7 +93,8 @@ class Entry(models.Model):
         return self.title
 
     def get_absolute_url(self):
-        return "/jrnl/%s/%s" % (self.pub_date.strftime("%Y/%m").lower(), self.slug)
+        # return "/jrnl/%s/%s" % (self.pub_date.strftime("%Y/%m").lower(), self.slug)
+        return reverse("jrnl:detail", kwargs={"year": self.pub_date.year, "month": self.pub_date.strftime("%m"), "slug": self.slug})
 
     def get_absolute_url_old(self):
         return "/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), self.slug)
diff --git a/app/blog/urls.py b/app/jrnl/urls.py
index d8fa395..d8fa395 100644
--- a/app/blog/urls.py
+++ b/app/jrnl/urls.py
diff --git a/app/blog/views.py b/app/jrnl/views.py
index 7dd755b..7dd755b 100644
--- a/app/blog/views.py
+++ b/app/jrnl/views.py
diff --git a/app/blog/widgets.py b/app/jrnl/widgets.py
index 030437b..030437b 100644
--- a/app/blog/widgets.py
+++ b/app/jrnl/widgets.py
diff --git a/app/locations/views.py b/app/locations/views.py
index bd5eb93..12901eb 100644
--- a/app/locations/views.py
+++ b/app/locations/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from blog.models import Entry
+from jrnl.models import Entry
 from locations.models import Country, Region, Route
 from projects.shortcuts import render_to_geojson
 
diff --git a/app/projects/models/natparks.py b/app/projects/models/natparks.py
index 2eee677..608c5c3 100644
--- a/app/projects/models/natparks.py
+++ b/app/projects/models/natparks.py
@@ -2,7 +2,7 @@ import datetime
 from PIL import Image
 from django.contrib.gis.db import models
 from django.conf import settings
-from blog.models import Entry
+from jrnl.models import Entry
 from photos.models import PhotoGallery
 from locations.models import State
 
diff --git a/app/src/admin.py b/app/src/admin.py
index a83dd66..558528d 100644
--- a/app/src/admin.py
+++ b/app/src/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from .models import Topic, Entry, Book
-from blog.admin import BlogEntryForm
+from jrnl.admin import BlogEntryForm
 
 class TopicAdmin(admin.ModelAdmin):
     prepopulated_fields = {"slug": ('name',), "pluralized_name":('name',)}
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(),