Finished up majority of v8 redesign, merging back to master

1 files changed, 8 insertions, 2 deletions

diff --git a/app/builder/views.py b/app/builder/views.py
index c0b8125..04c1285 100644
--- a/app/builder/views.py
+++ b/app/builder/views.py
@@ -1,12 +1,14 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPages, BuildPhotos, BuildProjects, BuildSitemap, BuildContact
+from django.conf import settings
+from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap
+from pages.models import PageGenerator
 
 options = {
     'writing': BuildWriting,
     'photo_galleries': BuildPhotos,
     'projects': BuildProjects,
-    'pages': BuildPages,
+    'pages': PageGenerator,
     'map': BuildMap,
     'feed': BuildWritingFeed,
     'sitemap': BuildSitemap,
@@ -22,6 +24,10 @@ def do_build(request):
         BuildWritingFeed().build()
         BuildSitemap().build()
         context = {'message': 'Writing %s to Disk' % section}
+    elif section == 'pages':
+        p = PageGenerator(settings.PROJ_ROOT + '_pages')
+        p.write_files()
+        context = {'message': 'Building pages from flatfiles'}
     elif section == 'scrapeflickr':
         from photos import retriever
         retriever.sync_sets()