Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging

cms/djangoapps/contentstore/tests/tests.py

@@ -8,6 +8,8 @@ from django.core.urlresolvers import reverse
 from path import path
 from tempfile import mkdtemp
 import json
+from fs.osfs import OSFS
+
 
 from student.models import Registration
 from django.contrib.auth.models import User
@@ -350,6 +352,33 @@ class ContentStoreTest(TestCase):
     def test_edit_unit_full(self):
         self.check_edit_unit('full')
 
+    def test_static_tab_reordering(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        
+        ms = modulestore('direct')
+        course = ms.get_item(Location(['i4x','edX','full','course','6.002_Spring_2012', None]))
+
+        # reverse the ordering
+        reverse_tabs = []
+        for tab in course.tabs:
+            if tab['type'] == 'static_tab':
+                reverse_tabs.insert(0, 'i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
+ 
+        resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs':reverse_tabs}), "application/json")
+
+        course = ms.get_item(Location(['i4x','edX','full','course','6.002_Spring_2012', None]))
+        
+        # compare to make sure that the tabs information is in the expected order after the server call
+        course_tabs = []
+        for tab in course.tabs:
+            if tab['type'] == 'static_tab':
+                course_tabs.append('i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
+
+        self.assertEqual(reverse_tabs, course_tabs)
+
+
+
+
     def test_about_overrides(self):
         '''
         This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html 
@@ -416,6 +445,17 @@ class ContentStoreTest(TestCase):
         items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None]))
         self.assertEqual(len(items), 0)
 
+    def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''):
+        fs = OSFS(root_dir / 'test_export')
+        self.assertTrue(fs.exists(dirname))
+
+        query_loc = Location('i4x', location.org, location.course, category_name, None)
+        items = modulestore.get_items(query_loc)
+
+        for item in items:
+            fs = OSFS(root_dir / ('test_export/' + dirname))
+            self.assertTrue(fs.exists(item.location.name + filename_suffix))
+
     def test_export_course(self):
         ms = modulestore('direct')
         cs = contentstore() 
@@ -430,6 +470,16 @@ class ContentStoreTest(TestCase):
         # export out to a tempdir
         export_to_xml(ms, cs, location, root_dir, 'test_export')
 
+        # check for static tabs
+        self.verify_content_existence(ms, root_dir, location, 'tabs', 'static_tab', '.html')
+
+        # check for custom_tags
+        self.verify_content_existence(ms, root_dir, location, 'info', 'course_info', '.html')
+
+        # check for custom_tags
+        self.verify_content_existence(ms, root_dir, location, 'custom_tags', 'custom_tag_template')
+  
+
         # remove old course
         delete_course(ms, cs, location)
 
@@ -445,6 +495,7 @@ class ContentStoreTest(TestCase):
 
         shutil.rmtree(root_dir)        
 
+
     def test_course_handouts_rewrites(self):
         ms = modulestore('direct')
         cs = contentstore() 

cms/djangoapps/contentstore/views.py

@@ -903,6 +903,52 @@ def static_pages(request, org, course, coursename):
 def edit_static(request, org, course, coursename):
     return render_to_response('edit-static-page.html', {})
 
+
+@login_required
+@expect_json
+def reorder_static_tabs(request):
+    tabs = request.POST['tabs']
+    course = get_course_for_item(tabs[0])
+
+    if not has_access(request.user, course.location):
+        raise PermissionDenied()
+
+    # get list of existing static tabs in course
+    # make sure they are the same lengths (i.e. the number of passed in tabs equals the number
+    # that we know about) otherwise we can drop some!
+        
+    existing_static_tabs = [t for t in course.tabs if t['type'] == 'static_tab']
+    if len(existing_static_tabs) != len(tabs):
+        return HttpResponseBadRequest()
+
+    # load all reference tabs, return BadRequest if we can't find any of them
+    tab_items =[]
+    for tab in tabs:
+        item = modulestore('direct').get_item(Location(tab))
+        if item is None:
+            return HttpResponseBadRequest()
+
+        tab_items.append(item)
+
+    # now just go through the existing course_tabs and re-order the static tabs
+    reordered_tabs = []
+    static_tab_idx = 0
+    for tab in course.tabs:
+        if tab['type'] == 'static_tab':
+            reordered_tabs.append({'type': 'static_tab', 
+                'name' : tab_items[static_tab_idx].metadata.get('display_name'), 
+                'url_slug' : tab_items[static_tab_idx].location.name})
+            static_tab_idx += 1
+        else:
+            reordered_tabs.append(tab)
+
+
+    # OK, re-assemble the static tabs in the new order        
+    course.tabs = reordered_tabs
+    modulestore('direct').update_metadata(course.location, course.metadata)
+    return HttpResponse()
+
+
 @login_required
 @ensure_csrf_cookie
 def edit_tabs(request, org, course, coursename):
@@ -914,12 +960,19 @@ def edit_tabs(request, org, course, coursename):
     if not has_access(request.user, location):
         raise PermissionDenied()
 
-    static_tabs = modulestore('direct').get_items(static_tabs_loc)
-
     # see tabs have been uninitialized (e.g. supporing courses created before tab support in studio)
     if course_item.tabs is None or len(course_item.tabs) == 0:
         initialize_course_tabs(course_item)
 
+    # first get all static tabs from the tabs list
+    # we do this because this is also the order in which items are displayed in the LMS
+    static_tabs_refs = [t for t in course_item.tabs if t['type'] == 'static_tab']
+
+    static_tabs = []
+    for static_tab_ref in static_tabs_refs:
+        static_tab_loc = Location(location)._replace(category='static_tab', name=static_tab_ref['url_slug'])
+        static_tabs.append(modulestore('direct').get_item(static_tab_loc))
+
     components = [
         static_tab.location.url()
         for static_tab
@@ -1326,7 +1379,6 @@ def import_course(request, org, course, name):
 @login_required
 def generate_export_course(request, org, course, name):
     location = ['i4x', org, course, 'course', name]
-    course_module = modulestore().get_item(location)
     # check that logged in user has permissions to this item
     if not has_access(request.user, location):
         raise PermissionDenied()
@@ -1373,3 +1425,10 @@ def export_course(request, org, course, name):
         'active_tab': 'export',
         'successful_import_redirect_url' : ''
     })
+
+def event(request):
+    '''
+    A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at
+    console logs don't get distracted :-)
+    '''
+    return HttpResponse(True)
\ No newline at end of file

cms/static/coffee/files.json

 {
   "js_files": [
+    "/static/js/vendor/RequireJS.js",
     "/static/js/vendor/jquery.min.js",
+    "/static/js/vendor/jquery-ui.min.js",
+    "/static/js/vendor/jquery.ui.draggable.js",
+    "/static/js/vendor/jquery.cookie.js",
     "/static/js/vendor/json2.js",
     "/static/js/vendor/underscore-min.js",
-    "/static/js/vendor/backbone-min.js",
-    "/static/js/vendor/RequireJS.js"
+    "/static/js/vendor/backbone-min.js"
   ]
 }

cms/static/coffee/src/views/tabs.coffee

@@ -15,7 +15,7 @@ class CMS.Views.TabsEdit extends Backbone.View
 
     @$('.components').sortable(
       handle: '.drag-handle'
-      update: (event, ui) => alert 'not yet implemented!'
+      update: @tabMoved
       helper: 'clone'
       opacity: '0.5'
       placeholder: 'component-placeholder'
@@ -24,6 +24,20 @@ class CMS.Views.TabsEdit extends Backbone.View
       items: '> .component'
     )    
 
+  tabMoved: (event, ui) =>
+    tabs = []
+    @$('.component').each((idx, element) =>
+        tabs.push($(element).data('id'))
+    )
+    $.ajax({
+      type:'POST',
+      url: '/reorder_static_tabs', 
+      data: JSON.stringify({
+        tabs : tabs
+      }),
+      contentType: 'application/json'
+    })
+
   addNewTab: (event) =>
     event.preventDefault()
 

cms/static/js/models/settings/course_details.js

@@ -68,10 +68,12 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({
 	save_videosource: function(newsource) {
 		// newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
 		// returns the videosource for the preview which iss the key whose speed is closest to 1
-		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null}); 
+		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null},
+				{ error : CMS.ServerError}); 
 		// TODO remove all whitespace w/in string
 		else {
-			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource);
+			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource,
+					{ error : CMS.ServerError});
 		}
 		
 		return this.videosourceSample();

cms/static/js/views/course_info_edit.js

@@ -99,10 +99,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         var targetModel = this.eventModel(event);
         targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() });
         // push change to display, hide the editor, submit the change        
-        targetModel.save({}, {error : function(model, xhr) {
-        	// TODO use a standard component
-        	window.alert(xhr.responseText);
-        }});
+        targetModel.save({}, {error : CMS.ServerError});
         this.closeEditor(this);
     },
     
@@ -145,8 +142,10 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         this.modelDom(event).remove();
         var cacheThis = this;
         targetModel.destroy({success : function (model, response) { 
-            cacheThis.collection.fetch({success : function() {cacheThis.render();}});
-        }
+            cacheThis.collection.fetch({success : function() {cacheThis.render();},
+                error : CMS.ServerError});
+        },
+        error : CMS.ServerError
         });
     },
 
@@ -225,7 +224,8 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
                             self.render();                
                         }
                     );
-                }
+                },
+                error : CMS.ServerError
             }
         );
     },
@@ -267,7 +267,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
     onSave: function(event) {
         this.model.set('data', this.$codeMirror.getValue());
         this.render();
-        this.model.save();
+        this.model.save({}, {error: CMS.ServerError});
         this.$form.hide();
         this.closeEditor(this);
     },

cms/static/js/views/server_error.js

+CMS.ServerError = function(model, error) {
+	// this handler is for the client:server communication not the validation errors which handleValidationError catches
+	window.alert("Server Error: " + error.responseText);
+};
\ No newline at end of file

cms/static/js/views/settings/main_settings_view.js

@@ -55,7 +55,7 @@ CMS.Views.ValidatingView = Backbone.View.extend({
 		var newVal = $(event.currentTarget).val();
 		if (currentVal != newVal) {
 			this.clearValidationErrors();
-			this.model.save(field, newVal);
+			this.model.save(field, newVal, { error : CMS.ServerError});
 			return true;
 		}
 		else return false;
@@ -211,15 +211,15 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 		'intro_video' : 'course-introduction-video',
 		'effort' : "course-effort"
 	},
-	
-	setupDatePicker : function(fieldName) {
-		var cacheModel = this.model;
-		var div = this.$el.find('#' + this.fieldToSelectorMap[fieldName]);
-		var datefield = $(div).find(".date");
-		var timefield = $(div).find(".time");
-		var cachethis = this;
-		var savefield = function() { 
-			cachethis.clearValidationErrors();
+
+    setupDatePicker: function (fieldName) {
+        var cacheModel = this.model;
+        var div = this.$el.find('#' + this.fieldToSelectorMap[fieldName]);
+        var datefield = $(div).find(".date");
+        var timefield = $(div).find(".time");
+        var cachethis = this;
+        var savefield = function () {
+            cachethis.clearValidationErrors();
             var date = datefield.datepicker('getDate');
             if (date) {
                 var time = timefield.timepicker("getSecondsFromMidnight");
@@ -227,20 +227,24 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
                     time = 0;
                 }
                 var newVal = new Date(date.getTime() + time * 1000);
-                if (cacheModel.get(fieldName) != newVal) cacheModel.save(fieldName, newVal);
+                if (cacheModel.get(fieldName).getTime() !== newVal.getTime()) {
+                    cacheModel.save(fieldName, newVal, { error: CMS.ServerError});
+                }
             }
-		};
-		
-		// instrument as date and time pickers
-		timefield.timepicker();
-		
-		// FIXME being called 2x on each change. Was trapping datepicker onSelect b4 but change to datepair broke that
-		datefield.datepicker({ onSelect : savefield });
-		timefield.on('changeTime', savefield);
-		
-		datefield.datepicker('setDate', this.model.get(fieldName));
-		if (this.model.has(fieldName)) timefield.timepicker('setTime', this.model.get(fieldName));
-	},
+        };
+
+        // instrument as date and time pickers
+        timefield.timepicker();
+        datefield.datepicker();
+
+        // Using the change event causes savefield to be triggered twice, but it is necessary
+        // to pick up when the date is typed directly in the field.
+        datefield.change(savefield);
+        timefield.on('changeTime', savefield);
+
+        datefield.datepicker('setDate', this.model.get(fieldName));
+        if (this.model.has(fieldName)) timefield.timepicker('setTime', this.model.get(fieldName));
+    },
 	
 	updateModel: function(event) {
 		switch (event.currentTarget.id) {
@@ -276,7 +280,8 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 	},
 	
 	removeSyllabus: function() {
-		if (this.model.has('syllabus'))	this.model.save({'syllabus': null});
+		if (this.model.has('syllabus'))	this.model.save({'syllabus': null}, 
+				{ error : CMS.ServerError});
 	},
 	
 	assetSyllabus : function() {
@@ -292,28 +297,30 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 		}
 	},
 	codeMirrors : {},
-	codeMirrorize : function(e, forcedTarget) {
-		if (forcedTarget) {
-			thisTarget = forcedTarget;
-			thisTarget.id = $(thisTarget).attr('id');
-		} else {
-			thisTarget = e.currentTarget;
-		}
+    codeMirrorize: function (e, forcedTarget) {
+        var thisTarget;
+        if (forcedTarget) {
+            thisTarget = forcedTarget;
+            thisTarget.id = $(thisTarget).attr('id');
+        } else {
+            thisTarget = e.currentTarget;
+        }
 
-		if (!this.codeMirrors[thisTarget.id]) {
-			var cachethis = this;
-			var field = this.selectorToField[thisTarget.id];
-			this.codeMirrors[thisTarget.id] = CodeMirror.fromTextArea(thisTarget, {
-				mode: "text/html", lineNumbers: true, lineWrapping: true,
-				onBlur : function(mirror) {
-					mirror.save();
-					cachethis.clearValidationErrors();
-					var newVal = mirror.getValue();
-					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal);
-				}
-			});
-		}
-	}
+        if (!this.codeMirrors[thisTarget.id]) {
+            var cachethis = this;
+            var field = this.selectorToField[thisTarget.id];
+            this.codeMirrors[thisTarget.id] = CodeMirror.fromTextArea(thisTarget, {
+                mode: "text/html", lineNumbers: true, lineWrapping: true,
+                onBlur: function (mirror) {
+                    mirror.save();
+                    cachethis.clearValidationErrors();
+                    var newVal = mirror.getValue();
+                    if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal,
+                        { error: CMS.ServerError});
+                }
+            });
+        }
+    }
 	
 });
 
@@ -404,7 +411,8 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 	setGracePeriod : function(event) {
 		event.data.clearValidationErrors();
 		var newVal = event.data.model.dateToGracePeriod($(event.currentTarget).timepicker('getTime'));
-		if (event.data.model.get('grace_period') != newVal) event.data.model.save('grace_period', newVal);
+		if (event.data.model.get('grace_period') != newVal) event.data.model.save('grace_period', newVal,
+				{ error : CMS.ServerError});
 	},
 	updateModel : function(event) {
 		if (!this.selectorToField[event.currentTarget.id]) return;
@@ -540,7 +548,8 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 					object[cutoff['designation']] = cutoff['cutoff'] / 100.0;
 					return object;
 				}, 
-				{}));
+				{}),
+				{ error : CMS.ServerError});
 	},
 	
 	addNewGrade: function(e) {
@@ -663,7 +672,7 @@ CMS.Views.Settings.GraderView = CMS.Views.ValidatingView.extend({
 				$(event.currentTarget).parent().append(
 						this.errorTemplate({message : 'For grading to work, you must change all "' + oldName +
 							'" subsections to "' + this.model.get('type') + '".'}));
-			};
+			}
 			break;
 		default:
 			this.saveIfChanged(event);
@@ -671,7 +680,8 @@ CMS.Views.Settings.GraderView = CMS.Views.ValidatingView.extend({
 		}
 	},
 	deleteModel : function(e) {
-		this.model.destroy();
+		this.model.destroy(
+				{ error : CMS.ServerError});
 		e.preventDefault();
 	}
 	

cms/templates/course_info.html

@@ -10,6 +10,7 @@
   <script type="text/javascript" src="${static.url('js/models/course_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/module_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/course_info_edit.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
   <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
   <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>

cms/templates/edit_subsection.html

@@ -23,10 +23,6 @@
           <label>Display Name:</label>
           <input type="text" value="${subsection.display_name}" class="subsection-display-name-input" data-metadata-name="display_name"/>
         </div>
-        <div>
-          <label>Format:</label>
-          <input type="text" value="${subsection.metadata['format'] if 'format' in subsection.metadata else ''}" class="unit-subtitle" data-metadata-name="format"/>
-        </div>
         <div class="sortable-unit-list">
           <label>Units:</label>
           ${units.enum_units(subsection, subsection_units=subsection_units)}

cms/templates/settings.html

@@ -20,6 +20,7 @@ from contentstore import utils
   <script type="text/javascript" src="${static.url('js/models/settings/course_settings.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/settings/main_settings_view.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   
   <script type="text/javascript">
     $(document).ready(function(){

cms/urls.py

@@ -17,6 +17,7 @@ urlpatterns = ('',
     url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'),
     url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'),
     url(r'^create_new_course', 'contentstore.views.create_new_course', name='create_new_course'),
+    url(r'^reorder_static_tabs', 'contentstore.views.reorder_static_tabs', name='reorder_static_tabs'),
 
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$',
         'contentstore.views.course_index', name='course_index'),
@@ -67,6 +68,8 @@ urlpatterns = ('',
 
     # temporary landing page for edge
     url(r'^edge$', 'contentstore.views.edge', name='edge'),
+    # noop to squelch ajax errors
+    url(r'^event$', 'contentstore.views.event', name='event'),
 
     url(r'^heartbeat$', include('heartbeat.urls')),
 )

common/djangoapps/student/management/commands/pearson_dump.py

 from optparse import make_option
 from json import dump
+from datetime import datetime
 
 from django.core.management.base import BaseCommand, CommandError
 
@@ -32,10 +33,9 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if len(args) < 1:
-            raise CommandError("Missing single argument: output JSON file")
-
-        # get output location:            
-        outputfile = args[0]
+            outputfile = datetime.utcnow().strftime("pearson-dump-%Y%m%d-%H%M%S.json")
+        else:
+            outputfile = args[0]
         
         # construct the query object to dump:
         registrations = TestCenterRegistration.objects.all()
@@ -65,6 +65,8 @@ class Command(BaseCommand):
                       }
             if len(registration.upload_error_message) > 0:
                 record['registration_error'] = registration.upload_error_message
+            if len(registration.testcenter_user.upload_error_message) > 0:
+                record['demographics_error'] = registration.testcenter_user.upload_error_message
             if registration.needs_uploading:
                 record['needs_uploading'] = True
 
@@ -72,5 +74,5 @@ class Command(BaseCommand):
             
         # dump output:
         with open(outputfile, 'w') as outfile:
-            dump(output, outfile)
+            dump(output, outfile, indent=2)
 

common/lib/xmodule/jasmine_test_runner.html.erb

@@ -14,7 +14,6 @@
   <script type="text/javascript" src="<%= common_js_root %>/vendor/jasmine-jquery.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.cookie.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/CodeMirror/codemirror.js"></script>
-  <script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/jquery.tinymce.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/RequireJS.js"></script>

common/lib/xmodule/xmodule/capa_module.py

@@ -229,6 +229,7 @@ class CapaModule(XModule):
             'element_id': self.location.html_id(),
             'id': self.id,
             'ajax_url': self.system.ajax_url,
+            'progress': Progress.to_js_status_str(self.get_progress())
         })
 
     def get_problem_html(self, encapsulate=True):

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -166,26 +166,14 @@ class CombinedOpenEndedModule(XModule):
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
         if self._max_score > MAX_SCORE_ALLOWED:
-            error_message = "Max score {0} is higher than max score allowed {1}".format(self._max_score,
-                MAX_SCORE_ALLOWED)
+            error_message = "Max score {0} is higher than max score allowed {1} for location {2}".format(self._max_score,
+                MAX_SCORE_ALLOWED, location)
             log.error(error_message)
             raise IncorrectMaxScoreError(error_message)
 
         rubric_renderer = CombinedOpenEndedRubric(system, True)
         rubric_string = stringify_children(definition['rubric'])
-        success, rubric_feedback = rubric_renderer.render_rubric(rubric_string)
-        if not success:
-            error_message = "Could not parse rubric : {0}".format(definition['rubric'])
-            log.error(error_message)
-            raise RubricParsingError(error_message)
-
-        rubric_categories = rubric_renderer.extract_categories(stringify_children(definition['rubric']))
-        for category in rubric_categories:
-            if len(category['options']) > (MAX_SCORE_ALLOWED + 1):
-                error_message = "Number of score points in rubric {0} higher than the max allowed, which is {1}".format(
-                    len(category['options']), MAX_SCORE_ALLOWED)
-                log.error(error_message)
-                raise RubricParsingError(error_message)
+        rubric_renderer.check_if_rubric_is_parseable(rubric_string, location, MAX_SCORE_ALLOWED)
 
         #Static data is passed to the child modules to render
         self.static_data = {

common/lib/xmodule/xmodule/combined_open_ended_rubric.py

@@ -36,6 +36,21 @@ class CombinedOpenEndedRubric(object):
             raise RubricParsingError("[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml))
         return success, html
 
+    def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed):
+        success, rubric_feedback = self.render_rubric(rubric_string)
+        if not success:
+            error_message = "Could not parse rubric : {0} for location {1}".format(rubric_string, location.url())
+            log.error(error_message)
+            raise RubricParsingError(error_message)
+
+        rubric_categories = self.extract_categories(rubric_string)
+        for category in rubric_categories:
+            if len(category['options']) > (max_score_allowed + 1):
+                error_message = "Number of score points in rubric {0} higher than the max allowed, which is {1}".format(
+                    len(category['options']), max_score_allowed)
+                log.error(error_message)
+                raise RubricParsingError(error_message)
+
     def extract_categories(self, element):
         '''
         Contstruct a list of categories such that the structure looks like:

common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html

+<section class="course-content">
+      <section class="xmodule_display xmodule_CombinedOpenEndedModule" data-type="CombinedOpenEnded">
+    <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="/courses/MITx/6.002x/2012_Fall/modx/i4x://MITx/6.002x/combinedopenended/CombinedOE" data-allow_reset="False" data-state="assessing" data-task-count="2" data-task-number="1">
+
+    <h2>Problem 1</h2>
+    <div class="status-container">
+            <h4>Status</h4>
+<div class="status-elements">
+<section id="combined-open-ended-status" class="combined-open-ended-status">
+        
+            <div class="statusitem" data-status-number="0">
+
+            Step 1 (Problem complete) : 1 / 1
+                <span class="correct" id="status"></span> 
+
+        </div>
+        
+            <div class="statusitem statusitem-current" data-status-number="1">
+
+            Step 2 (Being scored) : None / 1
+                <span class="grading" id="status"></span>
+
+        </div>
+</section>
+</div>
+
+    </div>
+
+    <div class="item-container">
+        <h4>Problem</h4>
+        <div class="problem-container">
+        <div class="item"><section id="openended_open_ended" class="open-ended-child" data-state="assessing" data-child-type="openended"><div class="error"></div>
+   <div class="prompt">
+    
+		Some prompt.
+	
+   </div>
+  <textarea rows="30" cols="80" name="answer" class="answer short-form-response" id="input_open_ended" disabled="disabled">Test submission. Yaaaaaaay!</textarea><div class="message-wrapper"></div>
+  <div class="grader-status">
+      <span class="grading" id="status_open_ended">Submitted for grading.</span>
+
+  </div>
+
+  <input type="button" value="Submit assessment" class="submit-button" name="show" style="display: none;"><input name="skip" class="skip-button" type="button" value="Skip Post-Assessment" style="display: none;"><div class="open-ended-action"></div>
+
+  <span id="answer_open_ended"></span>
+</section></div>
+        </div>
+
+
+        <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
+        <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
+    </div>
+
+    <a name="results">
+    <div class="result-container">
+    </div>
+</a></section><a name="results">
+
+
+</a></section><a name="results">
+
+</a><div><a name="results">
+	</a><a href="https://github.com/MITx/content-mit-6002x/tree/master/combinedopenended/CombinedOE.xml">Edit</a> /
+	<a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa-modal" onclick="javascript:getlog('i4x_MITx_6_002x_combinedopenended_CombinedOE', {
+        'location': 'i4x://MITx/6.002x/combinedopenended/CombinedOE',
+        'xqa_key': 'KUBrWtK3RAaBALLbccHrXeD3RHOpmZ2A',
+        'category': 'CombinedOpenEndedModule',
+        'user': 'blah'
+     })" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_log">QA</a>
+</div>
+<div><a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_debug" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_trig">Staff Debug Info</a></div>
+
+<section id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa-modal" class="modal xqa-modal" style="width:80%; left:20%; height:80%; overflow:auto">
+  <div class="inner-wrapper">
+    <header>
+      <h2>edX Content Quality Assessment</h2>
+    </header>
+
+    <form id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_form" class="xqa_form">
+      <label>Comment</label>
+      <input id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_entry" type="text" placeholder="comment">
+      <label>Tag</label>
+      <span style="color:black;vertical-align: -10pt">Optional tag (eg "done" or "broken"):&nbsp;       </span>
+      <input id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_tag" type="text" placeholder="tag" style="width:80px;display:inline">
+      <div class="submit">
+        <button name="submit" type="submit">Add comment</button>
+      </div>
+      <hr>
+      <div id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_log_data"></div>
+    </form>
+
+  </div>
+</section>
+
+<section class="modal staff-modal" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_debug" style="width:80%; left:20%; height:80%; overflow:auto;">
+  <div class="inner-wrapper" style="color:black">
+    <header>
+      <h2>Staff Debug</h2>
+    </header>
+    <div class="staff_info" style="display:block">
+is_released = <font color="red">Yes!</font>
+location = i4x://MITx/6.002x/combinedopenended/CombinedOE
+github = <a href="https://github.com/MITx/content-mit-6002x/tree/master/combinedopenended/CombinedOE.xml">https://github.com/MITx/content-mit-6002x/tree/master/combinedopenended/CombinedOE.xml</a>
+definition = <pre>None</pre>
+metadata = {
+    "showanswer": "attempted", 
+    "display_name": "Problem 1", 
+    "graceperiod": "1 day 12 hours 59 minutes 59 seconds", 
+    "xqa_key": "KUBrWtK3RAaBALLbccHrXeD3RHOpmZ2A", 
+    "rerandomize": "never", 
+    "start": "2012-09-05T12:00", 
+    "attempts": "10000", 
+    "data_dir": "content-mit-6002x", 
+    "max_score": "1"
+}
+category = CombinedOpenEndedModule
+    </div>
+  </div>
+</section>
+
+<div id="i4x_MITx_6_002x_combinedopenended_CombinedOE_setup"></div>
+    </section>

common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee

+describe 'CombinedOpenEnded', ->
+  beforeEach ->
+    spyOn Logger, 'log'
+    # load up some fixtures
+    loadFixtures 'combined-open-ended.html'
+    jasmine.Clock.useMock()
+    @element = $('.course-content')
+
+
+  describe 'constructor', ->
+    beforeEach ->
+      spyOn(Collapsible, 'setCollapsibles')
+      @combined = new CombinedOpenEnded @element
+
+    it 'set the element', ->
+      expect(@combined.element).toEqual @element
+
+    it 'get the correct values from data fields', ->
+      expect(@combined.ajax_url).toEqual '/courses/MITx/6.002x/2012_Fall/modx/i4x://MITx/6.002x/combinedopenended/CombinedOE'
+      expect(@combined.state).toEqual 'assessing'
+      expect(@combined.task_count).toEqual 2
+      expect(@combined.task_number).toEqual 1
+
+    it 'subelements are made collapsible', -> 
+      expect(Collapsible.setCollapsibles).toHaveBeenCalled()
+
+
+  describe 'poll', ->
+    beforeEach =>
+      # setup the spies
+      @combined = new CombinedOpenEnded @element
+      spyOn(@combined, 'reload').andCallFake -> return 0
+      window.setTimeout = jasmine.createSpy().andCallFake (callback, timeout) -> return 5
+
+    it 'polls at the correct intervals', =>
+      fakeResponseContinue = state: 'not done'
+      spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(fakeResponseContinue)
+      @combined.poll()
+      expect(window.setTimeout).toHaveBeenCalledWith(@combined.poll, 10000)
+      expect(window.queuePollerID).toBe(5)
+
+    it 'polling stops properly', =>
+      fakeResponseDone = state: "done" 
+      spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(fakeResponseDone)
+      @combined.poll()
+      expect(window.queuePollerID).toBeUndefined()
+      expect(window.setTimeout).not.toHaveBeenCalled()
+
+  describe 'rebind', ->
+    beforeEach ->
+      @combined = new CombinedOpenEnded @element
+      spyOn(@combined, 'queueing').andCallFake -> return 0
+      spyOn(@combined, 'skip_post_assessment').andCallFake -> return 0
+      window.setTimeout = jasmine.createSpy().andCallFake (callback, timeout) -> return 5
+
+    it 'when our child is in an assessing state', ->
+      @combined.child_state = 'assessing'
+      @combined.rebind()
+      expect(@combined.answer_area.attr("disabled")).toBe("disabled")
+      expect(@combined.submit_button.val()).toBe("Submit assessment")
+      expect(@combined.queueing).toHaveBeenCalled()
+
+    it 'when our child state is initial', -> 
+      @combined.child_state = 'initial'
+      @combined.rebind()
+      expect(@combined.answer_area.attr("disabled")).toBeUndefined()
+      expect(@combined.submit_button.val()).toBe("Submit")
+
+    it 'when our child state is post_assessment', -> 
+      @combined.child_state = 'post_assessment'
+      @combined.rebind()
+      expect(@combined.answer_area.attr("disabled")).toBe("disabled")
+      expect(@combined.submit_button.val()).toBe("Submit post-assessment")
+
+    it 'when our child state is done', -> 
+      spyOn(@combined, 'next_problem').andCallFake ->
+      @combined.child_state = 'done'
+      @combined.rebind()
+      expect(@combined.answer_area.attr("disabled")).toBe("disabled")
+      expect(@combined.next_problem).toHaveBeenCalled()
+
+  describe 'next_problem', ->
+    beforeEach ->
+      @combined = new CombinedOpenEnded @element
+      @combined.child_state = 'done'
+
+    it 'handling a successful call', ->
+      fakeResponse = 
+        success: true
+        html: "dummy html"
+        allow_reset: false
+      spyOn($, 'postWithPrefix').andCallFake (url, val, callback) -> callback(fakeResponse)
+      spyOn(@combined, 'reinitialize')
+      spyOn(@combined, 'rebind')
+      @combined.next_problem()
+      expect($.postWithPrefix).toHaveBeenCalled()
+      expect(@combined.reinitialize).toHaveBeenCalledWith(@combined.element)
+      expect(@combined.rebind).toHaveBeenCalled()
+      expect(@combined.answer_area.val()).toBe('')
+      expect(@combined.child_state).toBe('initial')
+
+    it 'handling an unsuccessful call', ->
+      fakeResponse =
+        success: false
+        error: 'This is an error'
+      spyOn($, 'postWithPrefix').andCallFake (url, val, callback) -> callback(fakeResponse)
+      @combined.next_problem()
+      expect(@combined.errors_area.html()).toBe(fakeResponse.error)
+
+
+

common/lib/xmodule/xmodule/js/spec/helper.coffee

@@ -64,7 +64,6 @@ jasmine.stubVideoPlayer = (context, enableParts, createPlayer=true) ->
   if createPlayer
     return new VideoPlayer(video: context.video)
 
-spyOn(window, 'onunload')
 
 # Stub jQuery.cookie
 $.cookie = jasmine.createSpy('jQuery.cookie').andReturn '1.0'

common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

@@ -329,7 +329,7 @@ class @CombinedOpenEnded
     $.postWithPrefix "#{@ajax_url}/check_for_score", (response) =>
       if response.state == "done" or response.state=="post_assessment"
         delete window.queuePollerID
-        location.reload()
+        @reload
       else
         window.queuePollerID = window.setTimeout(@poll, 10000)
 
@@ -353,3 +353,7 @@ class @CombinedOpenEnded
     new_text = ''
     new_text = "<div class='#{answer_class}' id='#{answer_id}'>#{answer_val}</div>"
     @answer_area.replaceWith(new_text)
+
+  # wrap this so that it can be mocked
+  reload: ->
+    location.reload()

common/lib/xmodule/xmodule/modulestore/xml_exporter.py

@@ -17,4 +17,26 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
   # export the static assets
   contentstore.export_all_for_course(course_location, root_dir + '/' + course_dir + '/static/')
 
+  # export the static tabs
+  export_extra_content(export_fs, modulestore, course_location, 'static_tab', 'tabs', '.html')
+
+  # export the custom tags
+  export_extra_content(export_fs, modulestore, course_location, 'custom_tag_template', 'custom_tags')
+
+  # export the course updates
+  export_extra_content(export_fs, modulestore, course_location, 'course_info', 'info', '.html')
+
+
+def export_extra_content(export_fs, modulestore, course_location, category_type, dirname, file_suffix = ''):
+  query_loc = Location('i4x', course_location.org, course_location.course, category_type, None)
+  items = modulestore.get_items(query_loc)
+
+  if len(items) > 0:
+    item_dir = export_fs.makeopendir(dirname)
+    for item in items:
+      with item_dir.open(item.location.name + file_suffix, 'w') as item_file:
+        item_file.write(item.definition['data'].encode('utf8'))
+
+
+
   
\ No newline at end of file

common/lib/xmodule/xmodule/open_ended_image_submission.py

@@ -216,6 +216,10 @@ def upload_to_s3(file_to_upload, keyname):
     Returns:
         public_url: URL to access uploaded file
     '''
+
+    #This commented out code is kept here in case we change the uploading method and require images to be
+    #converted before they are sent to S3.
+    #TODO: determine if commented code is needed and remove
     #im = Image.open(file_to_upload)
     #out_im = cStringIO.StringIO()
     #im.save(out_im, 'PNG')
@@ -229,6 +233,9 @@ def upload_to_s3(file_to_upload, keyname):
         k.key = keyname
         k.set_metadata('filename', file_to_upload.name)
         k.set_contents_from_file(file_to_upload)
+
+        #This commented out code is kept here in case we change the uploading method and require images to be
+        #converted before they are sent to S3.
         #k.set_contents_from_string(out_im.getvalue())
         #k.set_metadata("Content-Type", 'images/png')
 

common/lib/xmodule/xmodule/open_ended_module.py

@@ -258,7 +258,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """
         new_score_msg = self._parse_score_msg(score_msg, system)
         if not new_score_msg['valid']:
-            score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
+            new_score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
         self.record_latest_score(new_score_msg['score'])
         self.record_latest_post_assessment(score_msg)
@@ -405,6 +405,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
              'score': Numeric value (floating point is okay) to assign to answer
              'msg': grader_msg
              'feedback' : feedback from grader
+             'grader_type': what type of grader resulted in this score
+             'grader_id': id of the grader
+             'submission_id' : id of the submission
+             'success': whether or not this submission was successful
+             'rubric_scores': a list of rubric scores
+             'rubric_scores_complete': boolean if rubric scores are complete
+             'rubric_xml': the xml of the rubric in string format
              }
 
         Returns (valid_score_msg, correct, score, msg):

common/lib/xmodule/xmodule/openendedchild.py

@@ -117,7 +117,7 @@ class OpenEndedChild(object):
         pass
 
     def latest_answer(self):
-        """None if not available"""
+        """Empty string if not available"""
         if not self.history:
             return ""
         return self.history[-1].get('answer', "")
@@ -129,7 +129,7 @@ class OpenEndedChild(object):
         return self.history[-1].get('score')
 
     def latest_post_assessment(self, system):
-        """None if not available"""
+        """Empty string if not available"""
         if not self.history:
             return ""
         return self.history[-1].get('post_assessment', "")

common/lib/xmodule/xmodule/tests/test_self_assessment.py

@@ -10,8 +10,16 @@ from . import test_system
 
 class SelfAssessmentTest(unittest.TestCase):
 
-    definition = {'rubric': 'A rubric',
-                  'prompt': 'Who?',
+    rubric = '''<rubric><rubric>
+        <category>
+        <description>Response Quality</description>
+        <option>The response is not a satisfactory answer to the question.  It either fails to address the question or does so in a limited way, with no evidence of higher-order thinking.</option>
+        </category>
+         </rubric></rubric>'''
+
+    prompt = etree.XML("<prompt>This is sample prompt text.</prompt>")
+    definition = {'rubric': rubric,
+                  'prompt': prompt,
                   'submitmessage': 'Shall we submit now?',
                   'hintprompt': 'Consider this...',
                   }
@@ -23,47 +31,47 @@ class SelfAssessmentTest(unittest.TestCase):
 
     descriptor = Mock()
 
-    def test_import(self):
+    def setUp(self):
         state = json.dumps({'student_answers': ["Answer 1", "answer 2", "answer 3"],
                             'scores': [0, 1],
                             'hints': ['o hai'],
                             'state': SelfAssessmentModule.INITIAL,
                             'attempts': 2})
 
-        rubric = '''<rubric><rubric>
-            <category>
-			<description>Response Quality</description>
-			<option>The response is not a satisfactory answer to the question.  It either fails to address the question or does so in a limited way, with no evidence of higher-order thinking.</option>
-		    </category>
-             </rubric></rubric>'''
-
-        prompt = etree.XML("<prompt>Text</prompt>")
         static_data = {
                 'max_attempts': 10,
-                'rubric': etree.XML(rubric),
-                'prompt': prompt,
+                'rubric': etree.XML(self.rubric),
+                'prompt': self.prompt,
                 'max_score': 1,
-                'display_name': "Name"
+                'display_name': "Name",
+                'accept_file_upload' : False,
                 }
 
-        module = SelfAssessmentModule(test_system, self.location,
+        self.module = SelfAssessmentModule(test_system, self.location,
                                       self.definition, self.descriptor,
                                       static_data, state, metadata=self.metadata)
 
-        self.assertEqual(module.get_score()['score'], 0)
+    def test_get_html(self):
+        html = self.module.get_html(test_system)
+        self.assertTrue("This is sample prompt text" in html)
+
+    def test_self_assessment_flow(self):
 
+        self.assertEqual(self.module.get_score()['score'], 0)
 
-        module.save_answer({'student_answer': "I am an answer"}, test_system)
-        self.assertEqual(module.state, module.ASSESSING)
+        self.module.save_answer({'student_answer': "I am an answer"}, test_system)
+        self.assertEqual(self.module.state, self.module.ASSESSING)
 
-        module.save_assessment({'assessment': '0'}, test_system)
-        self.assertEqual(module.state, module.DONE)
+        self.module.save_assessment({'assessment': '0'}, test_system)
+        self.assertEqual(self.module.state, self.module.DONE)
 
-        d = module.reset({})
+
+        d = self.module.reset({})
         self.assertTrue(d['success'])
-        self.assertEqual(module.state, module.INITIAL)
+        self.assertEqual(self.module.state, self.module.INITIAL)
 
         # if we now assess as right, skip the REQUEST_HINT state
-        module.save_answer({'student_answer': 'answer 4'}, test_system)
-        module.save_assessment({'assessment': '1'}, test_system)
-        self.assertEqual(module.state, module.DONE)
+        self.module.save_answer({'student_answer': 'answer 4'}, test_system)
+        self.module.save_assessment({'assessment': '1'}, test_system)
+        self.assertEqual(self.module.state, self.module.DONE)
+

common/test/data/full/policies/6.002_Spring_2012.json

@@ -8,6 +8,7 @@
           {"type": "courseware"},
           {"type": "course_info", "name": "Course Info"},
           {"type": "static_tab", "url_slug": "syllabus", "name": "Syllabus"},
+          {"type": "static_tab", "url_slug": "resources", "name": "Resources"},
           {"type": "discussion", "name": "Discussion"},
           {"type": "wiki", "name": "Wiki"},
           {"type": "progress", "name": "Progress"}

common/test/data/full/tabs/resources.html

+<p>This is another sample tab</p>
\ No newline at end of file

lms/djangoapps/courseware/tabs.py

@@ -21,6 +21,16 @@ from fs.errors import ResourceNotFoundError
 from courseware.access import has_access
 from static_replace import replace_urls
 
+from lxml.html import rewrite_links
+from module_render import get_module
+from courseware.access import has_access
+from static_replace import replace_urls
+from xmodule.modulestore import Location
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.xml import XMLModuleStore
+from xmodule.x_module import XModule
+from student.models import unique_id_for_user
+
 from open_ended_grading import open_ended_notifications
 
 log = logging.getLogger(__name__)

lms/djangoapps/courseware/tests/factories.py

+import factory
+from student.models import (User, UserProfile, Registration,
+                            CourseEnrollmentAllowed)
+from django.contrib.auth.models import Group
+from datetime import datetime
+import uuid
+
+class UserProfileFactory(factory.Factory):
+    FACTORY_FOR = UserProfile
+
+    user = None
+    name = 'Robot Studio'
+    courseware = 'course.xml'
+
+class RegistrationFactory(factory.Factory):
+    FACTORY_FOR = Registration
+
+    user = None
+    activation_key = uuid.uuid4().hex
+
+class UserFactory(factory.Factory):
+    FACTORY_FOR = User
+
+    username = 'robot'
+    email = 'robot@edx.org'
+    password = 'test'
+    first_name = 'Robot'
+    last_name = 'Tester'
+    is_staff = False
+    is_active = True
+    is_superuser = False
+    last_login = datetime.now()
+    date_joined = datetime.now()
+
+class GroupFactory(factory.Factory):
+    FACTORY_FOR = Group
+
+    name = 'test_group'
+
+class CourseEnrollmentAllowedFactory(factory.Factory):
+    FACTORY_FOR = CourseEnrollmentAllowed
+
+    email = 'test@edx.org'
+    course_id = 'edX/test/2012_Fall'

lms/djangoapps/courseware/tests/test_access.py

+import unittest
+import time
+from mock import Mock
+from django.test import TestCase
+
+from xmodule.modulestore import Location 
+from factories import CourseEnrollmentAllowedFactory
+import courseware.access as access
+
+class AccessTestCase(TestCase):
+    def test__has_global_staff_access(self):
+        u = Mock(is_staff=False)
+        self.assertFalse(access._has_global_staff_access(u))
+
+        u = Mock(is_staff=True)
+        self.assertTrue(access._has_global_staff_access(u))
+
+    def test__has_access_to_location(self):
+        location = Location('i4x://edX/toy/course/2012_Fall')
+
+        self.assertFalse(access._has_access_to_location(None, location,
+                                                        'staff', None))
+        u = Mock()
+        u.is_authenticated.return_value = False
+        self.assertFalse(access._has_access_to_location(u, location,
+                                                        'staff', None))
+        u = Mock(is_staff=True)
+        self.assertTrue(access._has_access_to_location(u, location,
+                                                       'instructor', None))
+        # A user has staff access if they are in the staff group
+        u = Mock(is_staff=False)
+        g = Mock()
+        g.name = 'staff_edX/toy/2012_Fall'
+        u.groups.all.return_value = [g]
+        self.assertTrue(access._has_access_to_location(u, location,
+                                                        'staff', None))
+        # A user has staff access if they are in the instructor group
+        g.name = 'instructor_edX/toy/2012_Fall'
+        self.assertTrue(access._has_access_to_location(u, location,
+                                                        'staff', None))
+
+        # A user has instructor access if they are in the instructor group
+        g.name = 'instructor_edX/toy/2012_Fall'
+        self.assertTrue(access._has_access_to_location(u, location,
+                                                        'instructor', None))
+
+        # A user does not have staff access if they are 
+        # not in either the staff or the the instructor group
+        g.name = 'student_only'
+        self.assertFalse(access._has_access_to_location(u, location,
+                                                        'staff', None))
+
+        # A user does not have instructor access if they are 
+        # not in the instructor group
+        g.name = 'student_only'
+        self.assertFalse(access._has_access_to_location(u, location,
+                                                        'instructor', None))
+
+    def test__has_access_string(self):
+        u = Mock(is_staff=True)
+        self.assertFalse(access._has_access_string(u, 'not_global', 'staff', None))
+
+        u._has_global_staff_access.return_value = True
+        self.assertTrue(access._has_access_string(u, 'global', 'staff', None))
+
+        self.assertRaises(ValueError, access._has_access_string, u, 'global', 'not_staff', None)
+
+    def test__has_access_descriptor(self):
+        # TODO: override DISABLE_START_DATES and test the start date branch of the method
+        u = Mock()
+        d = Mock()
+        d.start = time.gmtime(time.time() - 86400) # make sure the start time is in the past
+
+        # Always returns true because DISABLE_START_DATES is set in test.py
+        self.assertTrue(access._has_access_descriptor(u, d, 'load'))
+        self.assertRaises(ValueError, access._has_access_descriptor, u, d, 'not_load_or_staff')
+
+    def test__has_access_course_desc_can_enroll(self):
+        u = Mock()
+        yesterday = time.gmtime(time.time() - 86400)
+        tomorrow = time.gmtime(time.time() + 86400)
+        c = Mock(enrollment_start=yesterday, enrollment_end=tomorrow)
+        c.metadata.get = 'is_public'
+
+        # User can enroll if it is between the start and end dates
+        self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+        # User can enroll if authenticated and specifically allowed for that course
+        # even outside the open enrollment period
+        u = Mock(email='test@edx.org', is_staff=False)
+        u.is_authenticated.return_value = True
+
+        c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/2012_Fall')
+        c.metadata.get = 'is_public'
+
+        allowed = CourseEnrollmentAllowedFactory(email=u.email, course_id=c.id)
+
+        self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+        # Staff can always enroll even outside the open enrollment period
+        u = Mock(email='test@edx.org', is_staff=True)
+        u.is_authenticated.return_value = True
+
+        c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/Whenever')
+        c.metadata.get = 'is_public'
+        self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+        # TODO: 
+        # Non-staff cannot enroll outside the open enrollment period if not specifically allowed

lms/djangoapps/courseware/tests/tests.py

@@ -64,6 +64,21 @@ def mongo_store_config(data_dir):
     }
 }
 
+def draft_mongo_store_config(data_dir):
+    return {
+    'default': {
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
+        'OPTIONS': {
+            'default_class': 'xmodule.raw_module.RawDescriptor',
+            'host': 'localhost',
+            'db': 'test_xmodule',
+            'collection': 'modulestore',
+            'fs_root': data_dir,
+            'render_template': 'mitxmako.shortcuts.render_to_string',
+        }
+    }
+}
+
 def xml_store_config(data_dir):
     return {
     'default': {
@@ -78,6 +93,7 @@ def xml_store_config(data_dir):
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
 TEST_DATA_MONGO_MODULESTORE = mongo_store_config(TEST_DATA_DIR)
+TEST_DATA_DRAFT_MONGO_MODULESTORE = draft_mongo_store_config(TEST_DATA_DIR)
 
 class ActivateLoginTestCase(TestCase):
     '''Check that we can activate and log in'''
@@ -423,6 +439,16 @@ class TestNavigation(PageLoader):
                                                    kwargs={'course_id': self.toy.id, 'chapter': 'secret:magic'}))
 
 
+@override_settings(MODULESTORE=TEST_DATA_DRAFT_MONGO_MODULESTORE)
+class TestDraftModuleStore(TestCase):
+    def test_get_items_with_course_items(self):
+        store = modulestore()
+        # fix was to allow get_items() to take the course_id parameter
+        store.get_items(Location(None, None, 'vertical', None, None), course_id='abc', depth=0)
+        # test success is just getting through the above statement. The bug was that 'course_id' argument was
+        # not allowed to be passed in (i.e. was throwing exception)
+
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestViewAuth(PageLoader):
     """Check that view authentication works properly"""

lms/djangoapps/courseware/views.py

@@ -233,10 +233,13 @@ def index(request, course_id, chapter=None, section=None,
                 # Specifically asked-for section doesn't exist
                 raise Http404
 
-            # Load all descendents of the section, because we're going to display it's
+            # Load all descendants of the section, because we're going to display its
             # html, which in general will need all of its children
+            section_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+                course.id, request.user, section_descriptor, depth=None)
+
             section_module = get_module(request.user, request, section_descriptor.location,
-                                        student_module_cache, course.id, position=position, depth=None)
+                section_module_cache, course.id, position=position, depth=None)
             if section_module is None:
                 # User may be trying to be clever and access something
                 # they don't have access to.

lms/djangoapps/open_ended_grading/peer_grading_service.py

@@ -31,6 +31,15 @@ This is a mock peer grading service that can be used for unit tests
 without making actual service calls to the grading controller
 """
 class MockPeerGradingService(object):
+    # TODO: get this rubric parsed and working
+    rubric = """<rubric>
+                    <category>
+                    <description>Description</description>
+                    <option>First option</option>
+                    <option>Second option</option>
+                    </category>
+                    </rubric>"""
+
     def get_next_submission(self, problem_location, grader_id):
         return json.dumps({'success': True,
                 'submission_id':1,
@@ -41,7 +50,7 @@ class MockPeerGradingService(object):
                 'max_score': 4})
 
     def save_grade(self, location, grader_id, submission_id, 
-            score, feedback, submission_key):
+            score, feedback, submission_key, rubric_scores):
         return json.dumps({'success': True})
 
     def is_student_calibrated(self, problem_location, grader_id):
@@ -57,16 +66,16 @@ class MockPeerGradingService(object):
                 'max_score': 4})
 
     def save_calibration_essay(self, problem_location, grader_id, 
-            calibration_essay_id, submission_key, score, feedback):
-        return {'success': True, 'actual_score': 2}
+            calibration_essay_id, submission_key, score, feedback, rubric_scores):
+        return json.dumps({'success': True, 'actual_score': 2})
 
     def get_problem_list(self, course_id, grader_id):
         return json.dumps({'success': True,
         'problem_list': [
           json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo1',
-            'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5}),
+              'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5, 'num_required': 7}),
           json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo2',
-            'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5})
+              'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5, 'num_required': 8})
         ]})
 
 class PeerGradingService(GradingService):
@@ -377,4 +386,4 @@ def save_calibration_essay(request, course_id):
         return HttpResponse(response, mimetype="application/json")
     except GradingServiceError:
         log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id))
-        return _err_response('Could not connect to grading service')
+        return _err_response('Could not connect to grading service')
\ No newline at end of file

lms/djangoapps/open_ended_grading/tests.py

@@ -6,6 +6,7 @@ django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/open
 
 from django.test import TestCase
 from open_ended_grading import staff_grading_service
+from open_ended_grading import peer_grading_service
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import Group
 
@@ -17,9 +18,10 @@ from nose import SkipTest
 from mock import patch, Mock
 import json
 
+import logging
+log = logging.getLogger(__name__)
 from override_settings import override_settings
 
-_mock_service = staff_grading_service.MockStaffGradingService()
 
 @override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
 class TestStaffGradingService(ct.PageLoader):
@@ -111,3 +113,144 @@ class TestStaffGradingService(ct.PageLoader):
         d = json.loads(r.content)
         self.assertTrue(d['success'], str(d))
         self.assertIsNotNone(d['problem_list'])
+
+    
+@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
+class TestPeerGradingService(ct.PageLoader):
+    '''
+    Check that staff grading service proxy works.  Basically just checking the
+    access control and error handling logic -- all the actual work is on the
+    backend.
+    '''
+    def setUp(self):
+        xmodule.modulestore.django._MODULESTORES = {}
+
+        self.student = 'view@test.com'
+        self.instructor = 'view2@test.com'
+        self.password = 'foo'
+        self.location = 'TestLocation'
+        self.create_account('u1', self.student, self.password)
+        self.create_account('u2', self.instructor, self.password)
+        self.activate_user(self.student)
+        self.activate_user(self.instructor)
+        
+        self.course_id = "edX/toy/2012_Fall"
+        self.toy = modulestore().get_course(self.course_id)
+
+        self.mock_service = peer_grading_service.peer_grading_service()
+
+        self.logout()
+
+    def test_get_next_submission_success(self):
+        self.login(self.student, self.password)
+
+        url = reverse('peer_grading_get_next_submission', kwargs={'course_id': self.course_id})
+        data = {'location': self.location}
+
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertTrue(d['success'])
+        self.assertIsNotNone(d['submission_id'])
+        self.assertIsNotNone(d['prompt'])
+        self.assertIsNotNone(d['submission_key'])
+        self.assertIsNotNone(d['max_score'])
+
+    def test_get_next_submission_missing_location(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_get_next_submission', kwargs={'course_id': self.course_id})
+        data = {}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertFalse(d['success'])
+        self.assertEqual(d['error'], "Missing required keys: location")
+
+    def test_save_grade_success(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_save_grade', kwargs={'course_id': self.course_id})
+        data = {'location': self.location, 
+                'submission_id': '1', 
+                'submission_key': 'fake key', 
+                'score': '2',
+                'feedback': 'This is feedback',
+                'rubric_scores[]': [1, 2]}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertTrue(d['success'])
+
+    def test_save_grade_missing_keys(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_save_grade', kwargs={'course_id': self.course_id})
+        data = {}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertFalse(d['success'])
+        self.assertTrue(d['error'].find('Missing required keys:') > -1)
+
+    def test_is_calibrated_success(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_is_student_calibrated', kwargs={'course_id': self.course_id})
+        data = {'location': self.location}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertTrue(d['success'])
+        self.assertTrue('calibrated' in d)
+
+    def test_is_calibrated_failure(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_is_student_calibrated', kwargs={'course_id': self.course_id})
+        data = {}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertFalse(d['success'])
+        self.assertFalse('calibrated' in d)
+
+    def test_show_calibration_essay_success(self):
+        self.login(self.student, self.password)
+
+        url = reverse('peer_grading_show_calibration_essay', kwargs={'course_id': self.course_id})
+        data = {'location': self.location}
+
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertTrue(d['success'])
+        self.assertIsNotNone(d['submission_id'])
+        self.assertIsNotNone(d['prompt'])
+        self.assertIsNotNone(d['submission_key'])
+        self.assertIsNotNone(d['max_score'])
+
+    def test_show_calibration_essay_missing_key(self):
+        self.login(self.student, self.password)
+
+        url = reverse('peer_grading_show_calibration_essay', kwargs={'course_id': self.course_id})
+        data = {}
+
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+
+        self.assertFalse(d['success'])
+        self.assertEqual(d['error'], "Missing required keys: location")
+
+    def test_save_calibration_essay_success(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_save_calibration_essay', kwargs={'course_id': self.course_id})
+        data = {'location': self.location, 
+                'submission_id': '1', 
+                'submission_key': 'fake key', 
+                'score': '2',
+                'feedback': 'This is feedback',
+                'rubric_scores[]': [1, 2]}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertTrue(d['success'])
+        self.assertTrue('actual_score' in d)
+
+    def test_save_calibration_essay_missing_keys(self):
+        self.login(self.student, self.password)
+        url = reverse('peer_grading_save_calibration_essay', kwargs={'course_id': self.course_id})
+        data = {}
+        r = self.check_for_post_code(200, url, data)
+        d = json.loads(r.content)
+        self.assertFalse(d['success'])
+        self.assertTrue(d['error'].find('Missing required keys:') > -1)
+        self.assertFalse('actual_score' in d)
+

lms/static/coffee/fixtures/staff_grading.html

+<section class="container">
+
+<div class="staff-grading" data-ajax_url="${ajax_url}">
+<h1>Staff grading</h1>
+<div class="breadcrumbs">
+</div>
+<div class="error-container">
+</div>
+<div class="message-container">
+</div>
+
+<! -- Problem List View -->
+<section class="problem-list-container">
+<h2>Instructions</h2>
+<div class="instructions">
+<p>This is the list of problems that current need to be graded in order to train the machine learning models. Each problem needs to be trained separately, and we have indicated the number of student submissions that need to be graded in order for a model to be generated. You can grade more than the minimum required number of submissions--this will improve the accuracy of machine learning, though with diminishing returns. You can see the current accuracy of machine learning while grading.</p>
+</div>
+
+<h2>Problem List</h2>
+    <table class="problem-list">
+    </table>
+</section>
+
+<!-- Grading View -->
+
+<section class="prompt-wrapper">
+    <h2 class="prompt-name"></h2>
+    <div class="meta-info-wrapper">
+        <h3>Problem Information</h3>
+        <div class="problem-meta-info-container">
+        </div>
+        <h3>Maching Learning Information</h3>
+        <div class="ml-error-info-container">
+        </div>
+    </div>
+    <div class="prompt-information-container">
+    <h3>Question</h3>
+        <div class="prompt-container">
+        </div>
+    </div>
+
+</section>
+
+<div class="action-button">
+    <input type=button value="Submit" class="action-button" name="show" />
+</div>
+
+<section class="grading-wrapper">
+<h2>Grading</h2>
+
+<div class="grading-container">
+<div class="submission-wrapper">
+<h3>Student Submission</h3>
+<div class="submission-container">
+</div>
+</div>
+<div class="evaluation">
+  <p class="score-selection-container">
+  </p>
+  <p class="grade-selection-container">
+  </p>
+  <textarea name="feedback" placeholder="Feedback for student (optional)"
+            class="feedback-area" cols="70" ></textarea>
+</div>
+  
+
+<div class="submission">
+<input type="button" value="Submit" class="submit-button" name="show"/>
+<input type="button" value="Skip" class="skip-button" name="skip"/>
+</div>
+
+</div>
+
+</div>
+</section>
+

lms/static/coffee/spec/courseware_spec.coffee

@@ -10,19 +10,6 @@ describe 'Courseware', ->
       Courseware.start()
       expect(Logger.bind).toHaveBeenCalled()
 
-  describe 'bind', ->
-    beforeEach ->
-      @courseware = new Courseware
-      setFixtures """
-        <div class="course-content">
-          <div class="sequence"></div>
-        </div>
-        """
-
-    it 'binds the content change event', ->
-      @courseware.bind()
-      expect($('.course-content .sequence')).toHandleWith 'contentChanged', @courseware.render
-
   describe 'render', ->
     beforeEach ->
       jasmine.stubRequests()
@@ -30,6 +17,7 @@ describe 'Courseware', ->
       spyOn(window, 'Histogram')
       spyOn(window, 'Problem')
       spyOn(window, 'Video')
+      spyOn(XModule, 'loadModules')
       setFixtures """
         <div class="course-content">
           <div id="video_1" class="video" data-streams="1.0:abc1234"></div>
@@ -41,12 +29,8 @@ describe 'Courseware', ->
         """
       @courseware.render()
 
-    it 'detect the video elements and convert them', ->
-      expect(window.Video).toHaveBeenCalledWith('1', '1.0:abc1234')
-      expect(window.Video).toHaveBeenCalledWith('2', '1.0:def5678')
-
-    it 'detect the problem element and convert it', ->
-      expect(window.Problem).toHaveBeenCalledWith(3, 'problem_3', '/example/url/')
+    it 'ensure that the XModules have been loaded', ->
+      expect(XModule.loadModules).toHaveBeenCalled()
 
     it 'detect the histrogram element and convert it', ->
       expect(window.Histogram).toHaveBeenCalledWith('3', [[0, 1]])

lms/static/coffee/spec/navigation_spec.coffee

@@ -16,6 +16,7 @@ describe 'Navigation', ->
             active: 1
             header: 'h3'
             autoHeight: false
+            heightStyle: 'content'
 
       describe 'when there is no active section', ->
         beforeEach ->
@@ -23,11 +24,12 @@ describe 'Navigation', ->
           $('#accordion').append('<ul><li></li></ul><ul><li></li></ul>')
           new Navigation
 
-        it 'activate the accordian with section 1 as active', ->
+        it 'activate the accordian with no section as active', ->
           expect($('#accordion').accordion).toHaveBeenCalledWith
-            active: 1
+            active: 0
             header: 'h3'
             autoHeight: false
+            heightStyle: 'content'
 
       it 'binds the accordionchange event', ->
         Navigation.bind()

lms/static/coffee/spec/staff_grading_spec.coffee

+describe 'StaffGrading', ->
+  beforeEach -> 
+    spyOn Logger, 'log'
+    @mockBackend = new StaffGradingBackend('url', true)
+
+  describe 'constructor', ->
+    beforeEach ->
+      @staff_grading = new StaffGrading(@mockBackend)
+
+    it 'we are originally in the list view', ->
+      expect(@staff_grading.list_view).toBe(true)

lms/static/coffee/src/staff_grading/staff_grading.coffee

@@ -9,9 +9,13 @@ state_graded = "graded"
 state_no_data = "no_data"
 state_error = "error"
 
-class StaffGradingBackend
+class @StaffGradingBackend
   constructor: (ajax_url, mock_backend) ->
     @ajax_url = ajax_url
+    # prevent this from trying to make requests when we don't have
+    # a proper url
+    if !ajax_url
+      mock_backend = true
     @mock_backend = mock_backend
     if @mock_backend
       @mock_cnt = 0
@@ -142,7 +146,7 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
         .error => callback({success: false, error: "Error occured while performing this operation"})
 
 
-class StaffGrading
+class @StaffGrading
   constructor: (backend) ->
     @backend = backend
 

lms/templates/feed.rss

@@ -6,7 +6,16 @@
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
   ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2013-01-21T14:00:12-07:00</updated>
+  <updated>2013-01-30T14:00:12-07:00</updated>
+  <entry>
+    <id>tag:www.edx.org,2012:Post/13</id>
+    <published>2013-01-30T10:00:00-07:00</published>
+    <updated>2013-01-30T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/eric-lander-secret-of-life')}"/>
+    <title>New biology course from human genome pioneer Eric Lander</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/eric-lander_240x180.jpg')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
   <entry>
     <id>tag:www.edx.org,2012:Post/12</id>
     <published>2013-01-29T10:00:00-07:00</published>

lms/templates/problem_ajax.html

-<section id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}"></section>
+<section id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}" progress="${progress}"></section>

lms/templates/static_templates/faq.html

@@ -39,7 +39,14 @@
         </article>
         <article class="response">
           <h3>Will certificates be awarded?</h3>
-          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of mastery. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
+          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate
+          of mastery. Certificates will be issued at the discretion of edX and the underlying
+          X University that offered the course under the name of the underlying "X
+          University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX.
+          For the courses in Fall 2012, those certificates will be free. There is a plan to
+          charge a modest fee for certificates in the future. Note: At this time, edX is
+          holding certificates for learners connected with Cuba, Iran, Syria and Sudan
+          pending confirmation that the issuance is in compliance with U.S. embargoes.</p>
         </article>
         <article class="response">
           <h3>What will the scope of the online courses be? How many? Which faculty?</h3>

lms/templates/static_templates/help.html

@@ -180,8 +180,17 @@
 
         <article class="response">
           <h3 class="question">Will I get a certificate for taking an edX course?</h3>
-          <div class="answer" id="certificates_and_credits_faq_answer_0">
-            <p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
+          <div class ="answer" id="certificates_and_credits_faq_answer_0">
+            <p>Online learners who receive a passing grade for a course will receive a certificate
+            of mastery at the discretion of edX and the underlying X University that offered
+            the course. For example, a certificate of mastery for MITx’s 6.002x Circuits &amp;
+            Electronics will come from edX and MITx.</p>
+            <p>If you passed the course, your certificate of mastery will be delivered online
+            through edx.org. So be sure to check your email in the weeks following the final
+            grading – you will be able to download and print your certificate. Note: At this
+            time, edX is holding certificates for learners connected with Cuba, Iran, Syria
+            and Sudan pending confirmation that the issuance is in compliance with U.S.
+            embargoes.</p>
           </div>
         </article>
         <article class="response">

lms/templates/static_templates/press_releases/bostonx_announcement.html

@@ -21,7 +21,7 @@
     <h2>Pilot project offers online courses, educational support and jobs training through Boston community centers</h2>
 
         <p><strong>CAMBRIDGE, MA  &ndash; January 29, 2013 &ndash;</strong>
-<a href="http://www.edx.org">EdX</a>, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a pilot project with the City of Boston, Harvard and MIT to make online courses available through internet-connected Boston neighborhood community centers, high schools and libraries. A first-of-its-kind project, BostonX brings together innovators from the country’s center of higher education to offer Boston residents access to courses, internships, job training and placement services, and locations for edX students to gather, socialize and deepen learning.</p>
+<a href="http://www.edx.org">EdX</a>, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a pilot project with the City of Boston, Harvard and MIT to make online courses available through internet-connected Boston neighborhood community centers, high schools and libraries. A first-of-its-kind project, BostonX brings together innovators from the country’s center of higher education to offer Boston residents access to courses, internships, job training and placement services, and locations for edX students to gather, socialize and deepen learning.</p>
 
 <p>“We must connect adults and youth in our neighborhoods with the opportunities of the knowledge economy,” said Mayor Tom Menino. “BostonX will help update our neighbors’ skills and our community centers. As a first step, I’m pleased to announce a pilot with Harvard, MIT and edX, their online learning initiative, which will bring free courses and training to our community centers.”</p>
  

lms/templates/static_templates/press_releases/template.html

+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>TITLE</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>TITLE</h1>
+    <hr class="horizontal-divider">
+      <article>
+    <h2>SUBTITLE</h2>
+
+        <p><strong>CAMBRIDGE, MA  &ndash; MONTH DAY, YEAR &ndash;</strong>
+
+Text</p>
+
+<p>more text</p>
+ 
+
+<h2>About edX</h2>
+
+<p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+
+      <section class="contact">
+        <p><strong>Contact:</strong></p>
+        <p>Brad Baker, Weber Shandwick for edX</p>
+        <p>BBaker@webershandwick.com</p>
+        <p>(617) 520-7043</p>
+      </section>
+
+      <section class="footer">
+        <hr class="horizontal-divider">
+        <div class="logo"></div><h3 class="date">DATE: 01 - 29 - 2013</h3>
+        <div class="social-sharing">
+        <hr class="horizontal-divider">
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=:BLAH+BLAH+BLAH+http://www.edx.org/press/LINK" class="share">
+            <img src="${static.url('images/social/twitter-sharing.png')}">
+          </a>
+        </a>
+        <a href="mailto:?subject=BLAH%BLAH%BLAH…http://edx.org/press/LINK" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}">
+        </a>
+        <div class="fb-like" data-href="http://edx.org/press/LINK" data-send="true" data-width="450" data-show-faces="true"></div>
+      </div>
+      </section>
+    </article>
+  </section>
+</section>

lms/urls.py

@@ -125,11 +125,14 @@ urlpatterns = ('',
     url(r'^press/bostonx-announcement$', 'static_template_view.views.render',
         {'template': 'press_releases/bostonx_announcement.html'},
         name="press/bostonx-announcement"),
+    url(r'^press/eric-lander-secret-of-life$', 'static_template_view.views.render',
+        {'template': 'press_releases/eric_lander_secret_of_life.html'},
+        name="press/eric-lander-secret-of-life"),
 
 
     # Should this always update to point to the latest press release?
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to',
-     {'url': '/press/bostonx-announcement'}),
+     {'url': '/press/eric-lander-secret-of-life'}),
 
 
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),