cut and pasted in changes from master on server to avoid merge conflict

2 files changed, 1 insertions, 15 deletions

diff --git a/app/builder/base.py b/app/builder/base.py
index a112aa0..9dc07e9 100644
--- a/app/builder/base.py
+++ b/app/builder/base.py
@@ -240,7 +240,7 @@ class BuildPages(Build):
         pages = model.objects.all()
         for page in pages:
             c = Context({'object':page,'SITE_URL':settings.SITE_URL, 'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL})
-            t = render_to_string('details/page.html',c).encode('utf-8') 
+            t = render_to_string(["details/%s.html" % page.slug, 'details/page.html'],c).encode('utf-8') 
             s = render_to_string('details/page.txt',c).encode('utf-8') 
             fpath = '%s/' %(page.slug)
             self.write_file(fpath,t)
diff --git a/app/pages/views.py b/app/pages/views.py
deleted file mode 100644
index f69efaf..0000000
--- a/app/pages/views.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.shortcuts import render_to_response,get_object_or_404
-from django.template import RequestContext
-from django.conf import settings
-
-
-from pages.models import Page
-
-def page(request,slug):
-    obj = get_object_or_404(Page, slug__exact=slug)
-    context = { 'object': obj,}
-    return render_to_response(["details/%s.html" % obj.slug, 'details/page.html'], context, context_instance = RequestContext(request))
-
-
-