Rewrote all sass and reconfigured HTML to use more microformats and

clearer class names

3 files changed, 14 insertions, 3 deletions

diff --git a/app/blog/models.py b/app/blog/models.py
index f01eeae..12b5b28 100644
--- a/app/blog/models.py
+++ b/app/blog/models.py
@@ -79,7 +79,7 @@ class Entry(models.Model):
         return self.title
 
     def get_absolute_url(self):
-        return "/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), self.slug)
+        return "/%s/%s" % (self.pub_date.strftime("%Y/%m").lower(), self.slug)
 
     def comment_period_open(self):
         return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date
diff --git a/app/blog/urls.py b/app/blog/urls.py
index d0a5224..0ac8870 100644
--- a/app/blog/urls.py
+++ b/app/blog/urls.py
@@ -1,10 +1,21 @@
 from django.conf.urls import *
 from django.views.generic.base import RedirectView
 
-
+"""
 urlpatterns = patterns('',
     (r'(?P<slug>[-\w]+)/(?P<page>\d+)/$', 'blog.views.entry_list_by_area'),
     (r'(?P<page>\d+)/$', 'blog.views.entry_list'),
     (r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/writing/%(slug)s/1/")),
     (r'', RedirectView.as_view(url="/writing/1/")),
 )
+"""
+
+urlpatterns = patterns('',
+    url(r'(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[-\w]+)$', 'blog.views.entry_detail'),
+    #url(r'(?P<year>\d{4})/(?P<month>\d{2})/$', 'blog.views.date_list', name="blog_by_month"),
+    #url(r'(?P<year>\d{4})/$', 'blog.views.date_list', name="blog_by_year"),
+    (r'(?P<slug>[-\w]+)/(?P<page>\d+)/$', 'blog.views.entry_list_by_area'),
+    (r'(?P<page>\d+)/$', 'blog.views.entry_list'),
+    url(r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/writing/%(slug)s/1/")),
+    #url(r'', RedirectView.as_view(url="/writing/1/")),
+)
diff --git a/app/blog/views.py b/app/blog/views.py
index 1d552eb..b82a2ab 100644
--- a/app/blog/views.py
+++ b/app/blog/views.py
@@ -16,7 +16,7 @@ def home(request):
     return render_to_response('archives/homepage.html', context, context_instance=RequestContext(request))
 
 
-def entry_detail(request, year, month, day, slug):
+def entry_detail(request, year, month, slug):
     obj = get_object_or_404(Entry, slug__exact=slug)
     photos = {}
     # if obj.photo_gallery: