Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes

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 
@@ -430,6 +459,28 @@ class ContentStoreTest(TestCase):
         # export out to a tempdir
         export_to_xml(ms, cs, location, root_dir, 'test_export')
 
+        # check for static tabs
+        fs = OSFS(root_dir / 'test_export')
+        self.assertTrue(fs.exists('tabs'))
+
+        static_tabs_query_loc = Location('i4x', location.org, location.course, 'static_tab', None)
+        static_tabs = ms.get_items(static_tabs_query_loc)
+
+        for static_tab in static_tabs:
+            fs = OSFS(root_dir / 'test_export/tabs')
+            self.assertTrue(fs.exists(static_tab.location.name + '.html'))
+
+        # check for custom_tags
+        fs = OSFS(root_dir / 'test_export')
+        self.assertTrue(fs.exists('custom_tags'))
+
+        custom_tags_query_loc = Location('i4x', location.org, location.course, 'custom_tag_template', None)
+        custom_tags = ms.get_items(custom_tags_query_loc)
+
+        for custom_tag in custom_tags:
+            fs = OSFS(root_dir / 'test_export/custom_tags')
+            self.assertTrue(fs.exists(custom_tag.location.name))       
+
         # remove old course
         delete_course(ms, cs, location)
 

cms/djangoapps/contentstore/views.py

@@ -527,7 +527,7 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_
 
     module.get_html = replace_static_urls(
         module.get_html,
-        module.metadata.get('data_dir', module.location.course),
+        '/static/' + module.metadata.get('data_dir', module.location.course),
         course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None])
     )
     save_preview_state(request, preview_id, descriptor.location.url(),
@@ -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

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;
@@ -227,7 +227,8 @@ 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) != newVal) cacheModel.save(fieldName, newVal,
+                		{ error : CMS.ServerError});
             }
 		};
 		
@@ -276,7 +277,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() {
@@ -309,7 +311,8 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 					mirror.save();
 					cachethis.clearValidationErrors();
 					var newVal = mirror.getValue();
-					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal);
+					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal,
+							{ error : CMS.ServerError});
 				}
 			});
 		}
@@ -404,7 +407,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 +544,8 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 					object[cutoff['designation']] = cutoff['cutoff'] / 100.0;
 					return object;
 				}, 
-				{}));
+				{}),
+				{ error : CMS.ServerError});
 	},
 	
 	addNewGrade: function(e) {
@@ -671,7 +676,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/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'),

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,9 +33,8 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if len(args) < 1:
-            raise CommandError("Missing single argument: output JSON file")
-
-        # get output location:            
+            outputfile = datetime.utcnow().strftime("pearson-dump-%Y%m%d-%H%M%S.json")
+        else:
             outputfile = args[0]
         
         # construct the query object to dump:
@@ -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/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):
@@ -355,7 +356,7 @@ class CapaModule(XModule):
                 id=self.location.html_id(), ajax_url=self.system.ajax_url) + html + "</div>"
 
         # now do the substitutions which are filesystem based, e.g. '/static/' prefixes
-        return self.system.replace_urls(html, self.metadata['data_dir'], course_namespace=self.location)
+        return self.system.replace_urls(html)
 
     def handle_ajax(self, dispatch, get):
         '''
@@ -460,7 +461,7 @@ class CapaModule(XModule):
         new_answers = dict()
         for answer_id in answers:
             try:
-                new_answer = {answer_id: self.system.replace_urls(answers[answer_id], self.metadata['data_dir'], course_namespace=self.location)}
+                new_answer = {answer_id: self.system.replace_urls(answers[answer_id])}
             except TypeError:
                 log.debug('Unable to perform URL substitution on answers[%s]: %s' % (answer_id, answers[answer_id]))
                 new_answer = {answer_id: answers[answer_id]}

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

@@ -17,4 +17,23 @@ 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')
+
+
+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/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"}

lms/djangoapps/courseware/courses.py

@@ -88,8 +88,7 @@ def course_image_url(course):
     """Try to look up the image url for the course.  If it's not found,
     log an error and return the dead link"""
     if isinstance(modulestore(), XMLModuleStore):
-        path = course.metadata['data_dir'] + "/images/course_image.jpg"
-        return try_staticfiles_lookup(path)
+        return '/static/' + course.metadata['data_dir'] + "/images/course_image.jpg"
     else:
         loc = course.location._replace(tag='c4x', category='asset', name='images_course_image.jpg')
         path = StaticContent.get_url_path_from_location(loc)

lms/djangoapps/courseware/module_render.py

@@ -3,6 +3,8 @@ import logging
 import pyparsing
 import sys
 
+from functools import partial
+
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
@@ -244,7 +246,11 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
                           # TODO (cpennington): This should be removed when all html from
                           # a module is coming through get_html and is therefore covered
                           # by the replace_static_urls code below
-                          replace_urls=replace_urls,
+                          replace_urls=partial(
+                              replace_urls,
+                              staticfiles_prefix='/static/' + descriptor.metadata.get('data_dir', ''),
+                              course_namespace=descriptor.location._replace(category=None, name=None),
+                          ),
                           node_path=settings.NODE_PATH,
                           anonymous_student_id=unique_id_for_user(user),
                           course_id=course_id,
@@ -280,7 +286,7 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
 
     module.get_html = replace_static_urls(
         _get_html,
-        module.metadata['data_dir'] if 'data_dir' in module.metadata else '', 
+        '/static/' + module.metadata.get('data_dir', ''),
         course_namespace = module.location._replace(category=None, name=None))
 
     # Allow URLs of the form '/course/' refer to the root of multicourse directory

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/envs/common.py

@@ -266,24 +266,6 @@ STATICFILES_DIRS = [
     COMMON_ROOT / "static",
     PROJECT_ROOT / "static",
 ]
-if os.path.isdir(DATA_DIR):
-    # Add the full course repo if there is no static directory
-    STATICFILES_DIRS += [
-        # TODO (cpennington): When courses are stored in a database, this
-        # should no longer be added to STATICFILES
-        (course_dir, DATA_DIR / course_dir)
-        for course_dir in os.listdir(DATA_DIR)
-        if (os.path.isdir(DATA_DIR / course_dir) and
-            not os.path.isdir(DATA_DIR / course_dir / 'static'))
-    ]
-    # Otherwise, add only the static directory from the course dir
-    STATICFILES_DIRS += [
-        # TODO (cpennington): When courses are stored in a database, this
-        # should no longer be added to STATICFILES
-        (course_dir, DATA_DIR / course_dir / 'static')
-        for course_dir in os.listdir(DATA_DIR)
-        if (os.path.isdir(DATA_DIR / course_dir / 'static'))
-    ]
 
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name

lms/envs/dev.py

@@ -106,6 +106,27 @@ VIRTUAL_UNIVERSITIES = []
 
 COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
 
+############################## Course static files ##########################
+if os.path.isdir(DATA_DIR):
+    # Add the full course repo if there is no static directory
+    STATICFILES_DIRS += [
+        # TODO (cpennington): When courses are stored in a database, this
+        # should no longer be added to STATICFILES
+        (course_dir, DATA_DIR / course_dir)
+        for course_dir in os.listdir(DATA_DIR)
+        if (os.path.isdir(DATA_DIR / course_dir) and
+            not os.path.isdir(DATA_DIR / course_dir / 'static'))
+    ]
+    # Otherwise, add only the static directory from the course dir
+    STATICFILES_DIRS += [
+        # TODO (cpennington): When courses are stored in a database, this
+        # should no longer be added to STATICFILES
+        (course_dir, DATA_DIR / course_dir / 'static')
+        for course_dir in os.listdir(DATA_DIR)
+        if (os.path.isdir(DATA_DIR / course_dir / 'static'))
+    ]
+
+
 ################################# mitx revision string  #####################
 
 MITX_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read().strip()

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>