Forked django middleware and moved it into the project. We'd like better django integration

auth/views.py

@@ -12,7 +12,7 @@ from django.core.validators import validate_email, validate_slug
 from django.db import connection
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from models import Registration, UserProfile
 
 log = logging.getLogger("mitx.auth")

circuit/views.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.http import Http404
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from models import ServerCircuit
 

courseware/capa/inputtypes.py

 from lxml.etree import Element
 from lxml import etree
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 class textline(object):
     @staticmethod

courseware/module_render.py

@@ -17,7 +17,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.template import Context
 from django.template import Context, loader
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from auth.models import UserProfile
 from models import StudentModule

courseware/modules/capa_module.py

@@ -16,7 +16,7 @@ from lxml import etree
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.http import Http404
 
 from x_module import XModule

courseware/modules/html_module.py

@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 from lxml import etree

courseware/modules/schematic_module.py

@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 

courseware/modules/seq_module.py

@@ -5,7 +5,7 @@ from lxml import etree
 ## TODO: Abstract out from Django
 from django.http import Http404
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 

courseware/modules/vertical_module.py

@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 from lxml import etree

courseware/modules/video_module.py

@@ -5,7 +5,7 @@ from lxml import etree
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 

courseware/views.py

@@ -12,7 +12,7 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from django.template import Context, loader
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.db import connection
 
 from lxml import etree

settings_new_askbot.py

@@ -3,6 +3,9 @@ import sys
 
 import djcelery
 
+LIB_URL = '/static/lib/'
+BOOK_URL = '/static/book/'
+
 # Our parent dir (mitx_all) is the BASE_DIR
 BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
 
@@ -85,7 +88,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
-    'djangomako.middleware.MakoMiddleware',
+    'mitxmako.middleware.MakoMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 

settings_old_askbot.py

@@ -81,7 +81,7 @@ MIDDLEWARE_CLASSES = (
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'track.middleware.TrackMiddleware',
-   'djangomako.middleware.MakoMiddleware',
+   'mitxmako.middleware.MakoMiddleware',
    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 

simplewiki/mdx_circuit.py

@@ -8,7 +8,7 @@ circuit:name becomes the circuit.
 
 import simplewiki.settings as settings
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 import markdown
 try:

simplewiki/views.py

@@ -15,10 +15,10 @@ from django.template import Context
 from django.template import RequestContext, Context, loader
 from django.utils import simplejson
 from django.utils.translation import ugettext_lazy as _
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from mako.lookup import TemplateLookup
 from mako.template import Template
-import djangomako.middleware
+import mitxmako.middleware
 
 from models import * # TODO: Clean up
 from settings import *

static_template_view/views.py

@@ -3,7 +3,7 @@
 # List of valid templates is explicitly managed for (short-term)
 # security reasons.
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.shortcuts import redirect
 from django.core.context_processors import csrf
 

staticbook/views.py

@@ -4,7 +4,7 @@ import os
 from django.conf import settings
 from django.http import Http404
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 def index(request, page=0): 
     if not request.user.is_authenticated():

util/views.py

@@ -10,7 +10,7 @@ from django.core.mail import send_mail
 from django.http import Http404
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 import courseware.capa.calc
 import track.views