Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor

cms/djangoapps/contentstore/tests/test_course_updates.py

 from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase
 from django.core.urlresolvers import reverse
 import json
-from cms.djangoapps.contentstore.course_info_model import update_course_updates
-
 
 class CourseUpdateTest(CourseTestCase):
     def test_course_update(self):
@@ -14,14 +12,17 @@ class CourseUpdateTest(CourseTestCase):
         content = '<iframe width="560" height="315" src="http://www.youtube.com/embed/RocY-Jd93XU" frameborder="0"></iframe>'
         payload = { 'content' : content,
                    'date' : 'January 8, 2013'}
-        # No means to post w/ provided_id missing. django doesn't handle. So, go direct for the create
-        payload = update_course_updates(['i4x', self.course_location.org, self.course_location.course, 'course_info', "updates"] , payload)
-        
         url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
-                                             'provided_id' : payload['id']})
-         
+                                             'provided_id' : ''})
+        
+        resp = self.client.post(url, json.dumps(payload), "application/json")
+        
+        payload= json.loads(resp.content)
+        
         self.assertHTMLEqual(content, payload['content'], "single iframe")
         
+        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
+                                             'provided_id' : payload['id']})
         content += '<div>div <p>p</p></div>'
         payload['content'] = content
         resp = self.client.post(url, json.dumps(payload), "application/json")

cms/djangoapps/contentstore/views.py

@@ -975,6 +975,11 @@ def course_info_updates(request, org, course, provided_id=None):
     # ??? No way to check for access permission afaik
     # get current updates
     location = ['i4x', org, course, 'course_info', "updates"]
+    
+    # Hmmm, provided_id is coming as empty string on create whereas I believe it used to be None :-(
+    # Possibly due to my removing the seemingly redundant pattern in urls.py
+    if provided_id == '':
+        provided_id = None
 
     # check that logged in user has permissions to this item
     if not has_access(request.user, location):

cms/static/coffee/src/views/module_edit.coffee

@@ -56,7 +56,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
     event.preventDefault()
     data = @module.save()
     data.metadata = _.extend(data.metadata, @metadata())
-    $modalCover.hide()
+    @hideModal()
     @model.save(data).done( =>
     #   # showToastMessage("Your changes have been saved.", null, 3)
       @module = null
@@ -70,11 +70,15 @@ class CMS.Views.ModuleEdit extends Backbone.View
     event.preventDefault()
     @$el.removeClass('editing')
     @$component_editor().slideUp(150)
+    @hideModal()
+
+  hideModal: ->
     $modalCover.hide()
+    $modalCover.removeClass('is-fixed')
 
   clickEditButton: (event) ->
     event.preventDefault()
     @$el.addClass('editing')
-    $modalCover.show()
+    $modalCover.show().addClass('is-fixed')
     @$component_editor().slideDown(150)
     @loadEdit()

cms/static/js/base.js

@@ -29,9 +29,7 @@ $(document).ready(function() {
     $('.expand-collapse-icon').bind('click', toggleSubmodules);
     $('.visibility-options').bind('change', setVisibility);
 
-    $('.unit-history ol a').bind('click', showHistoryModal);
     $modal.bind('click', hideModal);
-    $modalCover.bind('click', hideHistoryModal);
     $modalCover.bind('click', hideModal);
     $('.assets .upload-button').bind('click', showUploadModal);
     $('.upload-modal .close-button').bind('click', hideModal);
@@ -41,7 +39,13 @@ $(document).ready(function() {
     $('.unit .item-actions .delete-button').bind('click', deleteUnit);
     $('.new-unit-item').bind('click', createNewUnit);
 
-    $('.collapse-all-button').bind('click', collapseAll);
+    // toggling overview section details
+    $(function(){
+      if($('.courseware-section').length > 0) {
+        $('.toggle-button-sections').addClass('is-shown');
+      }
+    });
+    $('.toggle-button-sections').bind('click', toggleSections);
 
     // autosave when a field is updated on the subsection page
     $body.on('keyup', '.subsection-display-name-input, .unit-subtitle, .policy-list-value', checkForNewValue);
@@ -125,9 +129,30 @@ $(document).ready(function() {
     });
 });
 
-function collapseAll(e) {
-    $('.branch').addClass('collapsed');
-    $('.expand-collapse-icon').removeClass('collapse').addClass('expand');
+// function collapseAll(e) {
+//     $('.branch').addClass('collapsed');
+//     $('.expand-collapse-icon').removeClass('collapse').addClass('expand');
+// }
+
+function toggleSections(e) {
+  e.preventDefault();
+
+  $section = $('.courseware-section');
+  sectionCount = $section.length;
+  $button = $(this);
+  $labelCollapsed = $('<i class="ss-icon ss-symbolicons-block">up</i> <span class="label">Collapse All Sections</span>');
+  $labelExpanded = $('<i class="ss-icon ss-symbolicons-block">down</i> <span class="label">Expand All Sections</span>');
+
+  var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded;
+  $button.toggleClass('is-activated').html(buttonLabel);
+
+  if($button.hasClass('is-activated')) {
+      $section.addClass('collapsed');
+      $section.find('.expand-collapse-icon').removeClass('collapsed').addClass('expand');
+  } else {
+      $section.removeClass('collapsed');
+      $section.find('.expand-collapse-icon').removeClass('expand').addClass('collapse');
+  }
 }
 
 function editSectionPublishDate(e) {
@@ -498,9 +523,14 @@ function hideModal(e) {
     if(e) {
         e.preventDefault();
     }
-    $('.file-input').unbind('change', startUpload);
-    $modal.hide();
-    $modalCover.hide();
+    // Unit editors do not want the modal cover to hide when users click outside
+    // of the editor. Users must press Cancel or Save to exit the editor.
+    // module_edit adds and removes the "is-fixed" class.
+    if (!$modalCover.hasClass("is-fixed")) {
+        $('.file-input').unbind('change', startUpload);
+        $modal.hide();
+        $modalCover.hide();
+    }
 }
 
 function onKeyUp(e) {
@@ -530,21 +560,6 @@ function closeComponentEditor(e) {
     $(this).closest('.xmodule_edit').removeClass('editing').find('.component-editor').slideUp(150);
 }
 
-
-function showHistoryModal(e) {
-    e.preventDefault();
-
-    $modal.show();
-    $modalCover.show();
-}
-
-function hideHistoryModal(e) {
-    e.preventDefault();
-
-    $modal.hide();
-    $modalCover.hide();
-}
-
 function showDateSetter(e) {
     e.preventDefault();
     var $block = $(this).closest('.due-date-input');

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

@@ -388,6 +388,9 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 		var graceEle = this.$el.find('#course-grading-graceperiod');
 		graceEle.timepicker({'timeFormat' : 'H:i'}); // init doesn't take setTime
 		if (this.model.has('grace_period')) graceEle.timepicker('setTime', this.model.gracePeriodToDate());
+		// remove any existing listeners to keep them from piling on b/c render gets called frequently
+		graceEle.off('change', this.setGracePeriod);
+		graceEle.on('change', this, this.setGracePeriod);
 		
 		return this;
 	},
@@ -398,14 +401,16 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 	fieldToSelectorMap : {
 		'grace_period' : 'course-grading-graceperiod'
 	},
+	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);
+	},
 	updateModel : function(event) {
 		if (!this.selectorToField[event.currentTarget.id]) return;
 
 		switch (this.selectorToField[event.currentTarget.id]) {
-		case 'grace_period':
-			this.clearValidationErrors();
-			var newVal = this.model.dateToGracePeriod($(event.currentTarget).timepicker('getTime'));
-			if (this.model.get('grace_period') != newVal) this.model.save('grace_period', newVal);
+		case 'grace_period': // handled above
 			break;
 
 		default:

cms/static/sass/_courseware.scss

@@ -422,6 +422,14 @@ input.courseware-unit-search-input {
 			float: left;
 			margin: 29px 6px 16px 16px;
 			@include transition(none);
+
+			&.expand {
+				background-position: 0 0;
+			}
+
+			&.collapsed {
+				
+			}
 		}
 
 		.drag-handle {
@@ -501,14 +509,31 @@ input.courseware-unit-search-input {
 	}
 }
 
-.collapse-all-button {
+.toggle-button-sections {
+	display: none;
+	position: relative;
 	float: right;
 	margin-top: 10px;
+
 	font-size: 13px;
 	color: $darkGrey;
 
-	.collapse-all-icon {
-		margin-right: 6px;
+	&.is-shown {
+		display: block;
+	}
+
+	.ss-icon {
+		@include border-radius(20px);
+		position: relative;
+		top: -1px;
+		display: inline-block;
+		margin-right: 2px;
+		line-height: 5px;
+		font-size: 11px;
+	}
+
+	.label {
+		display: inline-block;
 	}
 }
 

cms/static/sass/_unit.scss

@@ -245,8 +245,8 @@
 
     &.editing {
       border: 1px solid $lightBluishGrey2;
-      z-index: 9999;
-
+      z-index: auto;
+      
       .drag-handle,
       .component-actions {
         display: none;
@@ -284,12 +284,17 @@
     overflow-x: auto;
   }
 
+  .wrapper-component-editor {
+    z-index: 9999;
+    position: relative;
+  }
+
   .component-editor {
     @include edit-box;
+    @include box-shadow(none);
     display: none;
     padding: 20px;
     border-radius: 2px 2px 0 0;
-    @include box-shadow(none);
 
     .metadata_edit {
       margin-bottom: 20px;

cms/templates/component.html

-<div class="component-editor">
-  <div class="module-editor">
-    ${editor}
-  </div>
-  <a href="#" class="save-button">Save</a>
-  <a href="#" class="cancel-button">Cancel</a>
+<div class="wrapper wrapper-component-editor">
+	<div class="component-editor">
+	  <div class="module-editor">
+	    ${editor}
+	  </div>
+	  <a href="#" class="save-button">Save</a>
+	  <a href="#" class="cancel-button">Cancel</a>
+	</div>
 </div>
+
 <div class="component-actions">
   <a href="#" class="edit-button standard"><span class="edit-icon"></span>Edit</a>
   <a href="#" class="delete-button standard"><span class="delete-icon"></span>Delete</a>  
 </div>
 <a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
-${preview}
+${preview}
\ No newline at end of file
+

cms/templates/overview.html

@@ -122,7 +122,7 @@
     <div class="inner-wrapper">
       <div class="page-actions">
         <a href="#" class="new-button new-courseware-section-button"><span class="plus-icon white"></span> New Section</a>
-        <a href="#" class="collapse-all-button"><span class="collapse-all-icon"></span>Collapse All</a>
+        <a href="#" class="toggle-button toggle-button-sections"><i class="ss-icon ss-symbolicons-block">up</i> <span class="label">Collapse All Sections</span></a>
       </div>
       <article class="courseware-overview" data-course-id="${context_course.location.url()}">        
         % for section in sections:

common/lib/xmodule/xmodule/course_module.py

@@ -6,6 +6,7 @@ from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor, SequenceModule
 from xmodule.timeparse import parse_time, stringify_time
 from xmodule.util.decorators import lazyproperty
+from datetime import datetime
 import json
 import logging
 import requests
@@ -18,6 +19,8 @@ log = logging.getLogger(__name__)
 edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False,
                                  remove_comments=True, remove_blank_text=True)
 
+_cached_toc = {}
+
 class CourseDescriptor(SequenceDescriptor):
     module_class = SequenceModule
 
@@ -50,6 +53,24 @@ class CourseDescriptor(SequenceDescriptor):
             """
             toc_url = self.book_url + 'toc.xml'
 
+            # cdodge: I've added this caching of TOC because in Mongo-backed instances (but not Filesystem stores)
+            # course modules have a very short lifespan and are constantly being created and torn down.
+            # Since this module in the __init__() method does a synchronous call to AWS to get the TOC
+            # this is causing a big performance problem. So let's be a bit smarter about this and cache
+            # each fetch and store in-mem for 10 minutes.
+            # NOTE: I have to get this onto sandbox ASAP as we're having runtime failures. I'd like to swing back and
+            # rewrite to use the traditional Django in-memory cache.
+            try:
+                # see if we already fetched this
+                if toc_url in _cached_toc:
+                    (table_of_contents, timestamp) = _cached_toc[toc_url]
+                    age = datetime.now() - timestamp
+                    # expire every 10 minutes
+                    if age.seconds < 600:
+                        return table_of_contents
+            except Exception as err:
+                pass
+
             # Get the table of contents from S3
             log.info("Retrieving textbook table of contents from %s" % toc_url)
             try:
@@ -62,6 +83,7 @@ class CourseDescriptor(SequenceDescriptor):
             # TOC is XML. Parse it
             try:
                 table_of_contents = etree.fromstring(r.text)
+                _cached_toc[toc_url] = (table_of_contents, datetime.now())
             except Exception as err:
                 msg = 'Error %s: Unable to parse XML for textbook table of contents at %s' % (err, toc_url)
                 log.error(msg)

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -284,7 +284,7 @@ class ModuleStore(object):
         """
         raise NotImplementedError
 
-    def get_items(self, location, depth=0):
+    def get_items(self, location, course_id=None, depth=0):
         """
         Returns a list of XModuleDescriptor instances for the items
         that match location. Any element of location that is None is treated

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -262,7 +262,7 @@ class MongoModuleStore(ModuleStoreBase):
         """
         return self.get_item(location)
 
-    def get_items(self, location, depth=0):
+    def get_items(self, location, course_id=None, depth=0):
         items = self.collection.find(
             location_to_query(location),
             sort=[('revision', pymongo.ASCENDING)],

common/lib/xmodule/xmodule/modulestore/xml.py

@@ -513,16 +513,22 @@ class XMLModuleStore(ModuleStoreBase):
         raise NotImplementedError("XMLModuleStores can't guarantee that definitions"
                                   " are unique. Use get_instance.")
 
-    def get_items(self, location, depth=0):
+    def get_items(self, location, course_id=None, depth=0):
         items = []
-        for _, modules in self.modules.iteritems():
-            for mod_loc, module in modules.iteritems():
 
+        def _add_get_items(self, location, modules):
+            for mod_loc, module in modules.iteritems():
                 # Locations match if each value in `location` is None or if the value from `location`
                 # matches the value from `mod_loc`
                 if all(goal is None or goal == value for goal, value in zip(location, mod_loc)):
                     items.append(module)
 
+        if course_id is None:
+            for _, modules in self.modules.iteritems():
+                _add_get_items(self, location, modules)
+        else:
+            _add_get_items(self, location, self.modules[course_id])
+
         return items
 
 

common/lib/xmodule/xmodule/modulestore/xml_importer.py

@@ -120,47 +120,16 @@ def import_from_xml(store, data_dir, course_dirs=None,
 
         course_data_path = None
         course_location = None
-        # Quick scan to get course Location as well as the course_data_path
+
+        # Quick scan to get course module as we need some info from there. Also we need to make sure that the
+        # course module is committed first into the store
         for module in module_store.modules[course_id].itervalues():
             if module.category == 'course':
                 course_data_path = path(data_dir) / module.metadata['data_dir']
                 course_location = module.location
 
-        if static_content_store is not None:
-            _namespace_rename = target_location_namespace if target_location_namespace is not None else  module_store.modules[course_id].location
-            
-            # first pass to find everything in /static/
-            import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store, 
-                _namespace_rename, subpath='static')
-
-        for module in module_store.modules[course_id].itervalues():
-
-            # remap module to the new namespace
-            if target_location_namespace is not None:
-                # This looks a bit wonky as we need to also change the 'name' of the imported course to be what
-                # the caller passed in
-                if module.location.category != 'course':
-                    module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
-                        course=target_location_namespace.course)
-                else:
-                    module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
-                        course=target_location_namespace.course, name=target_location_namespace.name)
-
-                # then remap children pointers since they too will be re-namespaced
-                children_locs = module.definition.get('children')
-                if children_locs is not None:
-                    new_locs = []
-                    for child in children_locs:
-                        child_loc = Location(child)
-                        new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
-                            course=target_location_namespace.course)
-
-                        new_locs.append(new_child_loc.url())
-
-                    module.definition['children'] = new_locs
+                module = remap_namespace(module, target_location_namespace)
 
-
-            if module.category == 'course':
                 # HACK: for now we don't support progress tabs. There's a special metadata configuration setting for this.
                 module.metadata['hide_progress_tab'] = True
 
@@ -174,12 +143,41 @@ def import_from_xml(store, data_dir, course_dirs=None,
                         {"type": "discussion", "name": "Discussion"},
                         {"type": "wiki", "name": "Wiki"}]  # note, add 'progress' when we can support it on Edge
 
+
+                store.update_item(module.location, module.definition['data'])
+                if 'children' in module.definition:
+                    store.update_children(module.location, module.definition['children'])
+                store.update_metadata(module.location, dict(module.own_metadata))
+
                 # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
                 # so let's make sure we import in case there are no other references to it in the modules
                 verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
 
                 course_items.append(module)
 
+
+                
+        # then import all the static content
+        if static_content_store is not None:
+            _namespace_rename = target_location_namespace if target_location_namespace is not None else  module_store.modules[course_id].location
+            
+            # first pass to find everything in /static/
+            import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store, 
+                _namespace_rename, subpath='static')
+
+        # finally loop through all the modules
+        for module in module_store.modules[course_id].itervalues():
+
+            if module.category == 'course':
+                # we've already saved the course module up at the top of the loop
+                # so just skip over it in the inner loop
+                continue
+
+            # remap module to the new namespace
+            if target_location_namespace is not None:
+                module = remap_namespace(module, target_location_namespace)
+
+
             if 'data' in module.definition:
                 module_data = module.definition['data']
 
@@ -216,6 +214,33 @@ def import_from_xml(store, data_dir, course_dirs=None,
 
     return module_store, course_items
 
+def remap_namespace(module, target_location_namespace):
+    if target_location_namespace is None:
+        return module
+        
+    # This looks a bit wonky as we need to also change the 'name' of the imported course to be what
+    # the caller passed in
+    if module.location.category != 'course':
+        module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
+            course=target_location_namespace.course)
+    else:
+        module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
+            course=target_location_namespace.course, name=target_location_namespace.name)
+
+    # then remap children pointers since they too will be re-namespaced
+    children_locs = module.definition.get('children')
+    if children_locs is not None:
+        new_locs = []
+        for child in children_locs:
+            child_loc = Location(child)
+            new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, 
+                course=target_location_namespace.course)
+
+            new_locs.append(new_child_loc.url())
+
+        module.definition['children'] = new_locs    
+
+    return module
 
 def validate_category_hierarcy(module_store, course_id, parent_category, expected_child_category):
     err_cnt = 0

common/static/js/vendor/timepicker/jquery.timepicker.css

 .ui-timepicker-list {
 	overflow-y: auto;
 	height: 150px;
-	width: 7.5em;
+	width: 6.5em;
 	background: #fff;
-	border: 1px solid #8891a1;
+	border: 1px solid #ddd;
 	margin: 0;
 	padding: 0;
 	list-style: none;
-	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
-	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
-	box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	box-shadow:0 5px 10px rgba(0,0,0,0.2);
 	outline: none;
-	z-index: 100001;
-	font-size: 12px;
+	z-index: 10001;
 }
 
 .ui-timepicker-list.ui-timepicker-with-duration {

lms/djangoapps/django_comment_client/utils.py

@@ -127,6 +127,7 @@ def sort_map_entries(category_map):
         sort_map_entries(category_map["subcategories"][title])
     category_map["children"] = [x[0] for x in sorted(things, key=lambda x: x[1]["sort_key"])]
 
+
 def initialize_discussion_info(course):
 
     global _DISCUSSIONINFO
@@ -134,32 +135,32 @@ def initialize_discussion_info(course):
         return
 
     course_id = course.id
-    all_modules = get_full_modules()[course_id]
 
     discussion_id_map = {}
-
     unexpanded_category_map = defaultdict(list)
 
-    for location, module in all_modules.items():
-        if location.category == 'discussion':
-            skip_module = False
-            for key in ('id', 'discussion_category', 'for'):
-                if key not in module.metadata:
-                    log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
-                    skip_module = True
-
-            if skip_module:
-                continue
-
-            id = module.metadata['id']
-            category = module.metadata['discussion_category']
-            title = module.metadata['for']
-            sort_key = module.metadata.get('sort_key', title)
-            category = " / ".join([x.strip() for x in category.split("/")])
-            last_category = category.split("/")[-1]
-            discussion_id_map[id] = {"location": location, "title": last_category + " / " + title}
-            unexpanded_category_map[category].append({"title": title, "id": id,
-                "sort_key": sort_key, "start_date": module.start})
+    # get all discussion models within this course_id
+    all_modules = modulestore().get_items(['i4x', course.location.org, course.location.course, 'discussion', None], course_id=course_id)
+
+    for module in all_modules:
+        skip_module = False
+        for key in ('id', 'discussion_category', 'for'):
+            if key not in module.metadata:
+                log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
+                skip_module = True
+
+        if skip_module:
+            continue
+
+        id = module.metadata['id']
+        category = module.metadata['discussion_category']
+        title = module.metadata['for']
+        sort_key = module.metadata.get('sort_key', title)
+        category = " / ".join([x.strip() for x in category.split("/")])
+        last_category = category.split("/")[-1]
+        discussion_id_map[id] = {"location": module.location, "title": last_category + " / " + title}
+        unexpanded_category_map[category].append({"title": title, "id": id,
+            "sort_key": sort_key, "start_date": module.start})
 
     category_map = {"entries": defaultdict(dict), "subcategories": defaultdict(dict)}
     for category_path, entries in unexpanded_category_map.items():