summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/blog/models.py2
-rw-r--r--app/blog/urls.py3
-rw-r--r--app/blog/views.py18
3 files changed, 19 insertions, 4 deletions
diff --git a/app/blog/models.py b/app/blog/models.py
index 8e7a513..a1025cc 100644
--- a/app/blog/models.py
+++ b/app/blog/models.py
@@ -37,6 +37,8 @@ TEMPLATES = (
(1, 'double'),
(2, 'single-dark'),
(3, 'double-dark'),
+ (4, 'bigimg'),
+ (5, 'bigimg-dark'),
)
class PostImage(models.Model):
title = models.CharField(max_length=100)
diff --git a/app/blog/urls.py b/app/blog/urls.py
index 6bd6538..a94eef3 100644
--- a/app/blog/urls.py
+++ b/app/blog/urls.py
@@ -1,13 +1,12 @@
from django.conf.urls import *
from django.views.generic.base import RedirectView
from blog.models import Entry
-from blog.views import BlogEntryListView
urlpatterns = patterns('',
(r'(?P<slug>[-\w]+)/(?P<page>\d+)/$', 'blog.views.entry_list_by_area'),
- (r'(?P<page>\d+)/$', BlogEntryListView.as_view()),
+ (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/")),
)
diff --git a/app/blog/views.py b/app/blog/views.py
index 67b6f41..04564fc 100644
--- a/app/blog/views.py
+++ b/app/blog/views.py
@@ -26,7 +26,6 @@ def entry_detail(request, year, month, day, slug):
"""
List of all writing
-"""
class BlogEntryListView(ListView):
template_name="archives/writing.html"
model = Entry
@@ -39,7 +38,22 @@ class BlogEntryListView(ListView):
self.request.page = self.kwargs['page']
return context
-
+"""
+def entry_list(request,page):
+ request.page_url = '/writing/%d/'
+ request.page = int(page)
+ try:
+ is_build = request.POST['builder']
+ extra_context={
+ 'page':page,
+ 'MEDIA_URL': settings.BAKED_MEDIA_URL
+ }
+ except:
+ extra_context={'page':page}
+ context = {
+ 'object_list': Entry.objects.filter(status__exact=1).order_by('-pub_date').select_related(),
+ }
+ return render_to_response("archives/writing.html", context, context_instance=RequestContext(request))
"""
Grabs entries by region or country
"""