From b86ba908da84367a6a599827bd5f522b88f440e6 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 29 Jan 2012 07:46:41 -0500
Subject: [PATCH] Forked django middleware and moved it into the project. We'd
 like better django integration

---
 auth/views.py                          | 2 +-
 circuit/views.py                       | 2 +-
 courseware/capa/inputtypes.py          | 2 +-
 courseware/module_render.py            | 2 +-
 courseware/modules/capa_module.py      | 2 +-
 courseware/modules/html_module.py      | 2 +-
 courseware/modules/schematic_module.py | 2 +-
 courseware/modules/seq_module.py       | 2 +-
 courseware/modules/vertical_module.py  | 2 +-
 courseware/modules/video_module.py     | 2 +-
 courseware/views.py                    | 2 +-
 settings_new_askbot.py                 | 5 ++++-
 settings_old_askbot.py                 | 2 +-
 simplewiki/mdx_circuit.py              | 2 +-
 simplewiki/views.py                    | 4 ++--
 static_template_view/views.py          | 2 +-
 staticbook/views.py                    | 2 +-
 util/views.py                          | 2 +-
 18 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/auth/views.py b/auth/views.py
index 56c9cd81deb..f2f945644fb 100644
--- a/auth/views.py
+++ b/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")
diff --git a/circuit/views.py b/circuit/views.py
index c8840484a84..96fcc83115a 100644
--- a/circuit/views.py
+++ b/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
 
diff --git a/courseware/capa/inputtypes.py b/courseware/capa/inputtypes.py
index c3b59a45372..c7732014da3 100644
--- a/courseware/capa/inputtypes.py
+++ b/courseware/capa/inputtypes.py
@@ -1,7 +1,7 @@
 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
diff --git a/courseware/module_render.py b/courseware/module_render.py
index 96833cc32de..6aa407bf801 100644
--- a/courseware/module_render.py
+++ b/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
diff --git a/courseware/modules/capa_module.py b/courseware/modules/capa_module.py
index 8eeeec1f3cd..b6c7f1748c7 100644
--- a/courseware/modules/capa_module.py
+++ b/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
diff --git a/courseware/modules/html_module.py b/courseware/modules/html_module.py
index 61c903d41c9..e72fea9dfde 100644
--- a/courseware/modules/html_module.py
+++ b/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
diff --git a/courseware/modules/schematic_module.py b/courseware/modules/schematic_module.py
index 9c7d291b920..0312321b4d9 100644
--- a/courseware/modules/schematic_module.py
+++ b/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
 
diff --git a/courseware/modules/seq_module.py b/courseware/modules/seq_module.py
index 2a91b0caa0b..02c8320ac80 100644
--- a/courseware/modules/seq_module.py
+++ b/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
 
diff --git a/courseware/modules/vertical_module.py b/courseware/modules/vertical_module.py
index 5530e224152..6939c75cc91 100644
--- a/courseware/modules/vertical_module.py
+++ b/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
diff --git a/courseware/modules/video_module.py b/courseware/modules/video_module.py
index 69a0837403e..4225f368805 100644
--- a/courseware/modules/video_module.py
+++ b/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
 
diff --git a/courseware/views.py b/courseware/views.py
index 9254da1e1e2..f7035975df6 100644
--- a/courseware/views.py
+++ b/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
diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index aa79e08ea8e..eb168dabd2a 100644
--- a/settings_new_askbot.py
+++ b/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',
 )
 
diff --git a/settings_old_askbot.py b/settings_old_askbot.py
index d7783c05db0..b711440d650 100644
--- a/settings_old_askbot.py
+++ b/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',
 )
 
diff --git a/simplewiki/mdx_circuit.py b/simplewiki/mdx_circuit.py
index efac721b7ce..465e7d9a3a5 100755
--- a/simplewiki/mdx_circuit.py
+++ b/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:
diff --git a/simplewiki/views.py b/simplewiki/views.py
index 16bfc11c440..856a45d1c0f 100644
--- a/simplewiki/views.py
+++ b/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 *
diff --git a/static_template_view/views.py b/static_template_view/views.py
index 5579e20c86b..734434b43a2 100644
--- a/static_template_view/views.py
+++ b/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
 
diff --git a/staticbook/views.py b/staticbook/views.py
index bb6e2ada19f..2e5712fc677 100644
--- a/staticbook/views.py
+++ b/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():
diff --git a/util/views.py b/util/views.py
index 139906e24a9..5f0400d1434 100644
--- a/util/views.py
+++ b/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
-- 
GitLab