diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/TODO | 1 | ||||
| -rw-r--r-- | app/builder/base.py | 4 | ||||
| -rw-r--r-- | app/builder/views.py | 10 | ||||
| -rw-r--r-- | app/jrnl/build.py | 14 |
4 files changed, 18 insertions, 11 deletions
@@ -24,7 +24,6 @@ shapefiles: http://koeppen-geiger.vu-wien.ac.at/shifts.htm #src -clean up design of book detail handle callbacks from paypal to deliver the book and link to files: https://developer.paypal.com/webapps/developer/docs/classic/ipn/integration-guide/IPNandPDTVariables/ diff --git a/app/builder/base.py b/app/builder/base.py index f44738d..9ac8ec9 100644 --- a/app/builder/base.py +++ b/app/builder/base.py @@ -266,8 +266,8 @@ class BuildWriting(Build): self.write_file(fpath, t) def build_homepage(self): - obj = apps.get_model('blog', 'homepagecurrator').objects.get(pk=1) - recent = apps.get_model('blog', 'entry').objects.filter(status__exact=1)[:4] + obj = apps.get_model('jrnl', 'homepagecurrator').objects.get(pk=1) + recent = apps.get_model('jrnl', 'entry').objects.filter(status__exact=1)[:4] template = obj.template_name c = Context({'homepage': obj, 'recent': recent, 'MEDIA_URL': settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL}) t = render_to_string(template, c).encode('utf-8') diff --git a/app/builder/views.py b/app/builder/views.py index d820f0e..a528197 100644 --- a/app/builder/views.py +++ b/app/builder/views.py @@ -1,8 +1,8 @@ from django.shortcuts import render_to_response from django.template import RequestContext -from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap, BuildPages +from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap, BuildPages from src.build import builder as src_builder -from jrnl.build import BuildJrnl, build_arc, build_detail +from jrnl.build import BuildJrnl, archive_builder, detail_builder, home_builder from resume.build import builder as resume_builder from books.build import builder as book_builder from photos.build import builder as photo_builder @@ -24,10 +24,10 @@ def do_build(request): context = {} if section == 'builddetails': context = {'message': 'Writing Jrnl Permalinks to Disk'} - build_detail() + detail_builder() elif section == 'writingarchives': context = {'message': 'Writing Jrnl Archives to Disk'} - build_arc() + archive_builder() elif section == 'resume': context = {'message': 'Writing Resume to Disk'} resume_builder() @@ -36,7 +36,7 @@ def do_build(request): BuildJrnl().build_feed("jrnl:feed") elif section == 'homepage': context = {'message': 'Writing index to Disk'} - BuildWriting().build_homepage() + home_builder() elif section == 'buildbooks': context = {'message': 'Writing Book Pages to Disk'} book_builder() diff --git a/app/jrnl/build.py b/app/jrnl/build.py index 6d5b0f6..51987f5 100644 --- a/app/jrnl/build.py +++ b/app/jrnl/build.py @@ -26,7 +26,6 @@ class BuildJrnl(BuildNew): self.build_month_view("jrnl:list_month") self.build_location_view() - def build_location_view(self): c = apps.get_model('locations', 'Country') r = apps.get_model('locations', 'Region') @@ -53,12 +52,21 @@ class BuildJrnl(BuildNew): else: self.write_file(base_path, response.content) + def build_homepage(self): + response = self.client.get('/') + self.write_file('', response.content) + -def build_arc(): +def archive_builder(): j = BuildJrnl("jrnl", "entry") j.build_arc() -def build_detail(): +def detail_builder(): + j = BuildJrnl("jrnl", "entry") + j.build_detail_view() + + +def home_builder(): j = BuildJrnl("jrnl", "entry") j.build_detail_view() |