Merge pull request #1113 from MITx/feature/dhm/course-info

move the underscore tempaltes to /static/client-templates and update the...

cms/static/js/template_loader.js

@@ -5,7 +5,7 @@
 	if (typeof window.templateLoader == 'function') return;
 	
     var templateLoader = {
-      templateVersion: "0.0.6",
+      templateVersion: "0.0.8",
       templates: {},
       loadRemoteTemplate: function(templateName, filename, callback) {
         if (!this.templates[templateName]) {

cms/static/js/views/course_info_edit.js

@@ -38,7 +38,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         // instantiates an editor template for each update in the collection
         window.templateLoader.loadRemoteTemplate("course_info_update",
         	// TODO Where should the template reside? how to use the static.url to create the path?
-            "/static/coffee/src/client_templates/course_info_update.html",
+            "/static/client_templates/course_info_update.html",
             function (raw_template) {
         		self.template = _.template(raw_template);
         		self.render();           
@@ -209,7 +209,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
             {
                 complete: function() {
                     window.templateLoader.loadRemoteTemplate("course_info_handouts",
-                        "/static/coffee/src/client_templates/course_info_handouts.html",
+                        "/static/client_templates/course_info_handouts.html",
                         function (raw_template) {
                             self.template = _.template(raw_template);
                             self.render();                

common/djangoapps/util/json_request.py

@@ -8,7 +8,7 @@ def expect_json(view_function):
     def expect_json_with_cloned_request(request, *args, **kwargs):
         # cdodge: fix postback errors in CMS. The POST 'content-type' header can include additional information
         # e.g. 'charset', so we can't do a direct string compare
-        if request.META['CONTENT_TYPE'].lower().startswith("application/json"):
+        if request.META.get('CONTENT_TYPE','').lower().startswith("application/json"):
             cloned_request = copy.copy(request)
             cloned_request.POST = cloned_request.POST.copy()
             cloned_request.POST.update(json.loads(request.body))