merge

courseware/content_parser.py

@@ -2,6 +2,7 @@ import json
 import hashlib
 
 from lxml import etree
+from mako.template import Template
 
 try: # This lets us do __name__ == ='__main__'
     from django.conf import settings
@@ -89,7 +90,10 @@ def id_tag(course):
 
 def course_file(user):
     # TODO: Cache. 
-    tree = etree.parse(settings.DATA_DIR+UserProfile.objects.get(user=user).courseware)
+    filename = settings.DATA_DIR+UserProfile.objects.get(user=user).courseware
+    data_template = Template(filename=filename)
+
+    tree = etree.XML(data_template.render())
     id_tag(tree)
     return tree
 

settings_new_askbot.py

@@ -3,6 +3,10 @@ import sys
 
 import djcelery
 
+# Configuration option for when we want to grab server error pages
+STATIC_GRAB = False
+DEV_CONTENT = True
+
 LIB_URL = '/static/lib/'
 LIB_URL = 'https://mitxstatic.s3.amazonaws.com/js/'
 BOOK_URL = '/static/book/'

static_template_view/views.py

@@ -6,6 +6,7 @@
 from mitxmako.shortcuts import render_to_response, render_to_string
 from django.shortcuts import redirect
 from django.core.context_processors import csrf
+from django.conf import settings
 
 #valid_templates=['index.html', 'staff.html', 'info.html', 'credits.html']
 valid_templates=['mitx_global.html', 
@@ -13,7 +14,15 @@ valid_templates=['mitx_global.html',
                  'tos.html', 
                  'privacy.html', 
                  'honor.html', 
-                 'copyright.html']
+                 'copyright.html', 
+                 '404.html']
+
+print "!!",settings.__dict__
+
+if settings.STATIC_GRAB: 
+    valid_templates = valid_templates+['server-down.html',
+                                       'server-error.html'
+                                       'server-overloaded.html']
 
 def index(request, template): 
     csrf_token = csrf(request)['csrf_token']