resolving merge conflict with master

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -27,10 +27,12 @@ from xmodule.contentstore.django import contentstore
 from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml
+from xmodule.templates import update_templates
 
 from xmodule.capa_module import CapaDescriptor
 from xmodule.course_module import CourseDescriptor
 from xmodule.seq_module import SequenceDescriptor
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
 TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
 TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
@@ -212,12 +214,21 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         fs = OSFS(root_dir / 'test_export/policies/6.002_Spring_2012')
         self.assertTrue(fs.exists('grading_policy.json'))
 
+        course = ms.get_item(location)
         # compare what's on disk compared to what we have in our course
         with fs.open('grading_policy.json','r') as grading_policy:
-            on_disk = loads(grading_policy.read())
-            course = ms.get_item(location)
+            on_disk = loads(grading_policy.read())    
             self.assertEqual(on_disk, course.definition['data']['grading_policy'])
 
+        #check for policy.json
+        self.assertTrue(fs.exists('policy.json'))
+
+        # compare what's on disk to what we have in the course module
+        with fs.open('policy.json','r') as course_policy:
+            on_disk = loads(course_policy.read())
+            self.assertIn('course/6.002_Spring_2012', on_disk)
+            self.assertEqual(on_disk['course/6.002_Spring_2012'], course.metadata)
+
         # remove old course
         delete_course(ms, cs, location)
 
@@ -409,3 +420,32 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertIn('markdown', context, "markdown is missing from context")
         self.assertIn('markdown', problem.metadata, "markdown is missing from metadata")
         self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")
+
+
+class TemplateTestCase(ModuleStoreTestCase):
+
+    def test_template_cleanup(self):        
+        ms = modulestore('direct')
+
+        # insert a bogus template in the store
+        bogus_template_location = Location('i4x', 'edx', 'templates', 'html', 'bogus')
+        source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Empty')
+        
+        ms.clone_item(source_template_location, bogus_template_location)
+
+        verify_create = ms.get_item(bogus_template_location)
+        self.assertIsNotNone(verify_create)
+
+        # now run cleanup
+        update_templates()
+
+        # now try to find dangling template, it should not be in DB any longer
+        asserted = False
+        try:
+            verify_create = ms.get_item(bogus_template_location)
+        except ItemNotFoundError:
+            asserted = True
+
+        self.assertTrue(asserted)     
+
+

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -245,7 +245,7 @@ class CourseGradingTest(CourseTestCase):
         altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__)
         self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "cutoff add D")
 
-        test_grader.grace_period = {'hours' :  '4'}
+        test_grader.grace_period = {'hours' :  4, 'minutes' : 5, 'seconds': 0}
         altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__)
         self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "4 hour grace period")
 

cms/djangoapps/contentstore/tests/tests.py

@@ -85,7 +85,6 @@ class ContentStoreTestCase(ModuleStoreTestCase):
         # Now make sure that the user is now actually activated
         self.assertTrue(user(email).is_active)
 
-
 class AuthTestCase(ContentStoreTestCase):
     """Check that various permissions-related things work"""
 

cms/djangoapps/models/settings/course_grading.py

@@ -155,7 +155,8 @@ class CourseGradingModel(object):
             if 'grace_period' in graceperiodjson:
                 graceperiodjson = graceperiodjson['grace_period']
 
-            grace_rep = " ".join(["%s %s" % (value, key) for (key, value) in graceperiodjson.iteritems()])
+            # lms requires these to be in a fixed order
+            grace_rep = "{0[hours]:d} hours {0[minutes]:d} minutes {0[seconds]:d} seconds".format(graceperiodjson) 
 
             descriptor = get_modulestore(course_location).get_item(course_location)
             descriptor.metadata['graceperiod'] = grace_rep
@@ -234,10 +235,10 @@ class CourseGradingModel(object):
 
     @staticmethod
     def convert_set_grace_period(descriptor):
-        # 5 hours 59 minutes 59 seconds => converted to iso format
+        # 5 hours 59 minutes 59 seconds => { hours: 5, minutes : 59, seconds : 59}
         rawgrace = descriptor.metadata.get('graceperiod', None)
         if rawgrace:
-            parsedgrace = {str(key): val for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)}
+            parsedgrace = {str(key): int(val) for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)}
             return parsedgrace
         else: return None
 

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

@@ -97,7 +97,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
                 }
                 var newVal = new Date(date.getTime() + time * 1000);
                 if (!cacheModel.has(fieldName) || cacheModel.get(fieldName).getTime() !== newVal.getTime()) {
-                    cacheModel.save(fieldName, newVal);
+                    cacheModel.save(fieldName, newVal, { error: CMS.ServerError});
                 }
             }
         };

common/lib/capa/capa/responsetypes.py

@@ -632,8 +632,14 @@ class MultipleChoiceResponse(LoncapaResponse):
 
         # define correct choices (after calling secondary setup)
         xml = self.xml
-        cxml = xml.xpath('//*[@id=$id]//choice[@correct="true"]', id=xml.get('id'))
-        self.correct_choices = [contextualize_text(choice.get('name'), self.context) for choice in cxml]
+        cxml = xml.xpath('//*[@id=$id]//choice', id=xml.get('id'))
+
+        # contextualize correct attribute and then select ones for which
+        # correct = "true"
+        self.correct_choices = [
+            contextualize_text(choice.get('name'), self.context)
+            for choice in cxml
+            if contextualize_text(choice.get('correct'), self.context) == "true"]
 
     def mc_setup_response(self):
         '''

common/lib/capa/capa/templates/codeinput.html

@@ -50,6 +50,7 @@
         },
         smartIndent: false
       });
+      $("#textbox_${id}").find('.CodeMirror-scroll').height(${int(13.5*eval(rows))});
     });
   </script>
 </section>

common/lib/capa/capa/templates/designprotein2dinput.html

 <section id="designprotein2dinput_${id}" class="designprotein2dinput">
-    <div class="script_placeholder" data-src="/static/js/capa/protex/protex.nocache.js"/>
+    <div class="script_placeholder" data-src="/static/js/capa/protex/protex.nocache.js?raw"/>
     <div class="script_placeholder" data-src="${applet_loader}"/>
 
     % if status == 'unsubmitted':

common/lib/xmodule/setup.py

@@ -37,6 +37,7 @@ setup(
             "timelimit = xmodule.timelimit_module:TimeLimitDescriptor",
             "vertical = xmodule.vertical_module:VerticalDescriptor",
             "video = xmodule.video_module:VideoDescriptor",
+            "videoalpha = xmodule.videoalpha_module:VideoAlphaDescriptor",
             "videodev = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "videosequence = xmodule.seq_module:SequenceDescriptor",
             "discussion = xmodule.discussion_module:DiscussionDescriptor",
@@ -44,7 +45,8 @@ setup(
             "static_tab = xmodule.html_module:StaticTabDescriptor",
             "custom_tag_template = xmodule.raw_module:RawDescriptor",
             "about = xmodule.html_module:AboutDescriptor",
-            "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor"
-        ]
+            "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor",
+            "foldit = xmodule.foldit_module:FolditDescriptor",
+         ]
     }
 )

common/lib/xmodule/xmodule/foldit_module.py

+import logging
+from lxml import etree
+from dateutil import parser
+
+from pkg_resources import resource_string
+
+from xmodule.editing_module import EditingDescriptor
+from xmodule.x_module import XModule
+from xmodule.xml_module import XmlDescriptor
+
+log = logging.getLogger(__name__)
+
+class FolditModule(XModule):
+    def __init__(self, system, location, definition, descriptor,
+                 instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor,
+                         instance_state, shared_state, **kwargs)
+        # ooh look--I'm lazy, so hardcoding the 7.00x required level.
+        # If we need it generalized, can pull from the xml later
+        self.required_level = 4
+        self.required_sublevel = 5
+
+        def parse_due_date():
+            """
+            Pull out the date, or None
+            """
+            s = self.metadata.get("due")
+            if s:
+                return parser.parse(s)
+            else:
+                return None
+
+        self.due_str = self.metadata.get("due", "None")
+        self.due = parse_due_date()
+
+    def is_complete(self):
+        """
+        Did the user get to the required level before the due date?
+        """
+        # We normally don't want django dependencies in xmodule.  foldit is
+        # special.  Import this late to avoid errors with things not yet being
+        # initialized.
+        from foldit.models import PuzzleComplete
+
+        complete = PuzzleComplete.is_level_complete(
+            self.system.anonymous_student_id,
+            self.required_level,
+            self.required_sublevel,
+            self.due)
+        return complete
+
+    def completed_puzzles(self):
+        """
+        Return a list of puzzles that this user has completed, as an array of
+        dicts:
+
+        [ {'set': int,
+           'subset': int,
+           'created': datetime} ]
+
+        The list is sorted by set, then subset
+        """
+        from foldit.models import PuzzleComplete
+
+        return sorted(
+            PuzzleComplete.completed_puzzles(self.system.anonymous_student_id),
+            key=lambda d: (d['set'], d['subset']))
+
+
+    def get_html(self):
+        """
+        Render the html for the module.
+        """
+        goal_level = '{0}-{1}'.format(
+            self.required_level,
+            self.required_sublevel)
+
+        context = {
+            'due': self.due_str,
+            'success': self.is_complete(),
+            'goal_level': goal_level,
+            'completed': self.completed_puzzles(),
+            }
+
+        return self.system.render_template('foldit.html', context)
+
+
+    def get_score(self):
+        """
+        0 / 1 based on whether student has gotten far enough.
+        """
+        score = 1 if self.is_complete() else 0
+        return {'score': score,
+                'total': self.max_score()}
+
+    def max_score(self):
+        return 1
+
+
+class FolditDescriptor(XmlDescriptor, EditingDescriptor):
+    """
+    Module for adding open ended response questions to courses
+    """
+    mako_template = "widgets/html-edit.html"
+    module_class = FolditModule
+    filename_extension = "xml"
+
+    stores_state = True
+    has_score = True
+    template_dir_name = "foldit"
+
+    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
+    js_module_name = "HTMLEditingDescriptor"
+
+    # The grade changes without any student interaction with the edx website,
+    # so always need to actually check.
+    always_recalculate_grades = True
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """
+        For now, don't need anything from the xml
+        """
+        return {}

common/lib/xmodule/xmodule/hidden_module.py

@@ -3,7 +3,11 @@ from xmodule.raw_module import RawDescriptor
 
 
 class HiddenModule(XModule):
-    pass
+    def get_html(self):
+        if self.system.user_is_staff:
+            return "ERROR: This module is unknown--students will not see it at all"
+        else:
+            return ""
 
 
 class HiddenDescriptor(RawDescriptor):

common/lib/xmodule/xmodule/js/src/.gitignore

-*.js
-
+# Please do not ignore *.js files. Some xmodules are written in JS.

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

+class @VideoAlpha
+  constructor: (element) ->
+    @el = $(element).find('.video')
+    @id = @el.attr('id').replace(/video_/, '')
+    @start = @el.data('start')
+    @end = @el.data('end')
+    @caption_data_dir = @el.data('caption-data-dir')
+    @caption_asset_path = @el.data('caption-asset-path')
+    @show_captions = @el.data('show-captions').toString() == "true"
+    @el = $("#video_#{@id}")
+    if @parseYoutubeId(@el.data("streams")) is true
+      @videoType = "youtube"
+      @fetchMetadata()
+      @parseSpeed()
+    else
+      @videoType = "html5"
+      @parseHtml5Sources @el.data('mp4-source'), @el.data('webm-source'), @el.data('ogg-source')
+      @speeds = ['0.75', '1.0', '1.25', '1.50']
+      sub = @el.data('sub')
+      if (typeof sub isnt "string") or (sub.length is 0)
+        sub = ""
+        @show_captions = false
+      @videos =
+        "0.75": sub
+        "1.0": sub
+        "1.25": sub
+        "1.5": sub
+      @setSpeed $.cookie('video_speed')
+    $("#video_#{@id}").data('video', this).addClass('video-load-complete')
+    if @show_captions is true
+      @hide_captions = $.cookie('hide_captions') == 'true'
+    else
+      @hide_captions = true
+      $.cookie('hide_captions', @hide_captions, expires: 3650, path: '/')
+      @el.addClass 'closed'
+    if ((@videoType is "youtube") and (YT.Player)) or ((@videoType is "html5") and (HTML5Video.Player))
+      @embed()
+    else
+      if @videoType is "youtube"
+        window.onYouTubePlayerAPIReady = =>
+          @embed()
+      else if @videoType is "html5"
+        window.onHTML5PlayerAPIReady = =>
+          @embed()
+
+  youtubeId: (speed)->
+    @videos[speed || @speed]
+
+  parseYoutubeId: (videos)->
+    return false  if (typeof videos isnt "string") or (videos.length is 0)
+    @videos = {}
+    $.each videos.split(/,/), (index, video) =>
+      speed = undefined
+      video = video.split(/:/)
+      speed = parseFloat(video[0]).toFixed(2).replace(/\.00$/, ".0")
+      @videos[speed] = video[1]
+    true
+
+  parseHtml5Sources: (mp4Source, webmSource, oggSource)->
+    @html5Sources =
+      mp4: null
+      webm: null
+      ogg: null
+    @html5Sources.mp4 = mp4Source  if (typeof mp4Source is "string") and (mp4Source.length > 0)
+    @html5Sources.webm = webmSource  if (typeof webmSource is "string") and (webmSource.length > 0)
+    @html5Sources.ogg = oggSource  if (typeof oggSource is "string") and (oggSource.length > 0)
+
+  parseSpeed: ->
+    @speeds = ($.map @videos, (url, speed) -> speed).sort()
+    @setSpeed $.cookie('video_speed')
+
+  setSpeed: (newSpeed, updateCookie)->
+    if @speeds.indexOf(newSpeed) isnt -1
+      @speed = newSpeed
+
+      if updateCookie isnt false
+        $.cookie "video_speed", "" + newSpeed,
+          expires: 3650
+          path: "/"
+    else
+      @speed = "1.0"
+
+  embed: ->
+    @player = new VideoPlayerAlpha video: this
+
+  fetchMetadata: (url) ->
+    @metadata = {}
+    $.each @videos, (speed, url) =>
+      $.get "https://gdata.youtube.com/feeds/api/videos/#{url}?v=2&alt=jsonc", ((data) => @metadata[data.data.id] = data.data) , 'jsonp'
+
+  getDuration: ->
+    @metadata[@youtubeId()].duration
+
+  log: (eventName)->
+    logInfo =
+      id: @id
+      code: @youtubeId()
+      currentTime: @player.currentTime
+      speed: @speed
+    if @videoType is "youtube"
+      logInfo.code = @youtubeId()
+    else logInfo.code = "html5"  if @videoType is "html5"
+    Logger.log eventName, logInfo

common/lib/xmodule/xmodule/js/src/videoalpha/display/_subview.coffee

+class @SubviewAlpha
+  constructor: (options) ->
+    $.each options, (key, value) =>
+      @[key] = value
+    @initialize()
+    @render()
+    @bind()
+
+  $: (selector) ->
+    $(selector, @el)
+
+  initialize: ->
+  render: ->
+  bind: ->

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_caption.coffee

+class @VideoCaptionAlpha extends SubviewAlpha
+  initialize: ->
+    @loaded = false
+
+  bind: ->
+    $(window).bind('resize', @resize)
+    @$('.hide-subtitles').click @toggle
+    @$('.subtitles').mouseenter(@onMouseEnter).mouseleave(@onMouseLeave)
+      .mousemove(@onMovement).bind('mousewheel', @onMovement)
+      .bind('DOMMouseScroll', @onMovement)
+
+  captionURL: ->
+    "#{@captionAssetPath}#{@youtubeId}.srt.sjson"
+
+  render: ->
+    # TODO: make it so you can have a video with no captions.
+    #@$('.video-wrapper').after """
+    #  <ol class="subtitles"><li>Attempting to load captions...</li></ol>
+    #  """
+    @$('.video-wrapper').after """
+      <ol class="subtitles"></ol>
+      """
+    @$('.video-controls .secondary-controls').append """
+      <a href="#" class="hide-subtitles" title="Turn off captions">Captions</a>
+      """#"
+    @$('.subtitles').css maxHeight: @$('.video-wrapper').height() - 5
+    @fetchCaption()
+
+  fetchCaption: ->
+    $.getWithPrefix @captionURL(), (captions) =>
+      @captions = captions.text
+      @start = captions.start
+
+      @loaded = true
+
+      if onTouchBasedDevice()
+        $('.subtitles li').html "Caption will be displayed when you start playing the video."
+      else
+        @renderCaption()
+
+  renderCaption: ->
+    container = $('<ol>')
+
+    $.each @captions, (index, text) =>
+      container.append $('<li>').html(text).attr
+        'data-index': index
+        'data-start': @start[index]
+
+    @$('.subtitles').html(container.html())
+    @$('.subtitles li[data-index]').click @seekPlayer
+
+    # prepend and append an empty <li> for cosmetic reason
+    @$('.subtitles').prepend($('<li class="spacing">').height(@topSpacingHeight()))
+      .append($('<li class="spacing">').height(@bottomSpacingHeight()))
+
+    @rendered = true
+
+  search: (time) ->
+    if @loaded
+      min = 0
+      max = @start.length - 1
+
+      while min < max
+        index = Math.ceil((max + min) / 2)
+        if time < @start[index]
+          max = index - 1
+        if time >= @start[index]
+          min = index
+      return min
+
+  play: ->
+    if @loaded
+      @renderCaption() unless @rendered
+      @playing = true
+
+  pause: ->
+    if @loaded
+      @playing = false
+
+  updatePlayTime: (time) ->
+    if @loaded
+      # This 250ms offset is required to match the video speed
+      time = Math.round(Time.convert(time, @currentSpeed, '1.0') * 1000 + 250)
+      newIndex = @search time
+
+      if newIndex != undefined && @currentIndex != newIndex
+        if @currentIndex
+          @$(".subtitles li.current").removeClass('current')
+        @$(".subtitles li[data-index='#{newIndex}']").addClass('current')
+
+        @currentIndex = newIndex
+        @scrollCaption()
+
+  resize: =>
+    @$('.subtitles').css maxHeight: @captionHeight()
+    @$('.subtitles .spacing:first').height(@topSpacingHeight())
+    @$('.subtitles .spacing:last').height(@bottomSpacingHeight())
+    @scrollCaption()
+
+  onMouseEnter: =>
+    clearTimeout @frozen if @frozen
+    @frozen = setTimeout @onMouseLeave, 10000
+
+  onMovement: =>
+    @onMouseEnter()
+
+  onMouseLeave: =>
+    clearTimeout @frozen if @frozen
+    @frozen = null
+    @scrollCaption() if @playing
+
+  scrollCaption: ->
+    if !@frozen && @$('.subtitles .current:first').length
+      @$('.subtitles').scrollTo @$('.subtitles .current:first'),
+        offset: - @calculateOffset(@$('.subtitles .current:first'))
+
+  seekPlayer: (event) =>
+    event.preventDefault()
+    time = Math.round(Time.convert($(event.target).data('start'), '1.0', @currentSpeed) / 1000)
+    $(@).trigger('seek', time)
+
+  calculateOffset: (element) ->
+    @captionHeight() / 2 - element.height() / 2
+
+  topSpacingHeight: ->
+    @calculateOffset(@$('.subtitles li:not(.spacing):first'))
+
+  bottomSpacingHeight: ->
+    @calculateOffset(@$('.subtitles li:not(.spacing):last'))
+
+  toggle: (event) =>
+    event.preventDefault()
+    if @el.hasClass('closed') # Captions are "closed" e.g. turned off
+      @hideCaptions(false)
+    else # Captions are on
+      @hideCaptions(true)
+
+  hideCaptions: (hide_captions) =>
+    if hide_captions
+      @$('.hide-subtitles').attr('title', 'Turn on captions')
+      @el.addClass('closed')
+    else
+      @$('.hide-subtitles').attr('title', 'Turn off captions')
+      @el.removeClass('closed')
+      @scrollCaption()
+    $.cookie('hide_captions', hide_captions, expires: 3650, path: '/')
+
+  captionHeight: ->
+    if @el.hasClass('fullscreen')
+      $(window).height() - @$('.video-controls').height()
+    else
+      @$('.video-wrapper').height()

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_control.coffee

+class @VideoControlAlpha extends SubviewAlpha
+  bind: ->
+    @$('.video_control').click @togglePlayback
+
+  render: ->
+    @el.append """
+      <div class="slider"></div>
+      <div>
+        <ul class="vcr">
+          <li><a class="video_control" href="#"></a></li>
+          <li>
+            <div class="vidtime">0:00 / 0:00</div>
+          </li>
+        </ul>
+        <div class="secondary-controls">
+          <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a>
+        </div>
+      </div>
+      """#"
+
+    unless onTouchBasedDevice()
+      @$('.video_control').addClass('play').html('Play')
+
+  play: ->
+    @$('.video_control').removeClass('play').addClass('pause').html('Pause')
+
+  pause: ->
+    @$('.video_control').removeClass('pause').addClass('play').html('Play')
+
+  togglePlayback: (event) =>
+    event.preventDefault()
+    if @$('.video_control').hasClass('play')
+      $(@).trigger('play')
+    else if @$('.video_control').hasClass('pause')
+      $(@).trigger('pause')

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_progress_slider.coffee

+class @VideoProgressSliderAlpha extends SubviewAlpha
+  initialize: ->
+    @buildSlider() unless onTouchBasedDevice()
+
+  buildSlider: ->
+    @slider = @el.slider
+      range: 'min'
+      change: @onChange
+      slide: @onSlide
+      stop: @onStop
+    @buildHandle()
+
+  buildHandle: ->
+    @handle = @$('.slider .ui-slider-handle')
+    @handle.qtip
+      content: "#{Time.format(@slider.slider('value'))}"
+      position:
+        my: 'bottom center'
+        at: 'top center'
+        container: @handle
+      hide:
+        delay: 700
+      style:
+        classes: 'ui-tooltip-slider'
+        widget: true
+
+  play: =>
+    @buildSlider() unless @slider
+
+  updatePlayTime: (currentTime, duration) ->
+    if @slider && !@frozen
+      @slider.slider('option', 'max', duration)
+      @slider.slider('value', currentTime)
+
+  onSlide: (event, ui) =>
+    @frozen = true
+    @updateTooltip(ui.value)
+    $(@).trigger('seek', ui.value)
+
+  onChange: (event, ui) =>
+    @updateTooltip(ui.value)
+
+  onStop: (event, ui) =>
+    @frozen = true
+    $(@).trigger('seek', ui.value)
+    setTimeout (=> @frozen = false), 200
+
+  updateTooltip: (value)->
+    @handle.qtip('option', 'content.text', "#{Time.format(value)}")

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_quality_control.coffee

+class @VideoQualityControlAlpha extends SubviewAlpha
+  initialize: ->
+    @quality = null;
+
+  bind: ->
+    @$('.quality_control').click @toggleQuality
+
+  render: ->
+    @el.append """
+      <a href="#" class="quality_control" title="HD">HD</a>
+      """#"
+
+  onQualityChange: (value) ->
+    @quality = value
+    if @quality in ['hd720', 'hd1080', 'highres']
+        @el.addClass('active')
+    else
+        @el.removeClass('active')
+
+  toggleQuality: (event) =>
+    event.preventDefault()
+    if @quality in ['hd720', 'hd1080', 'highres']
+        newQuality = 'large'
+    else
+        newQuality = 'hd720'
+    $(@).trigger('changeQuality', newQuality)
\ No newline at end of file

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_speed_control.coffee

+class @VideoSpeedControlAlpha extends SubviewAlpha
+  bind: ->
+    @$('.video_speeds a').click @changeVideoSpeed
+    if onTouchBasedDevice()
+      @$('.speeds').click (event) ->
+        event.preventDefault()
+        $(this).toggleClass('open')
+    else
+      @$('.speeds').mouseenter ->
+        $(this).addClass('open')
+      @$('.speeds').mouseleave ->
+        $(this).removeClass('open')
+      @$('.speeds').click (event) ->
+        event.preventDefault()
+        $(this).removeClass('open')
+
+  render: ->
+    @el.prepend """
+      <div class="speeds">
+        <a href="#">
+          <h3>Speed</h3>
+          <p class="active"></p>
+        </a>
+        <ol class="video_speeds"></ol>
+      </div>
+      """
+    $.each @speeds, (index, speed) =>
+      link = $('<a>').attr(href: "#").html("#{speed}x")
+      @$('.video_speeds').prepend($('<li>').attr('data-speed', speed).html(link))
+    @setSpeed @currentSpeed
+
+  reRender: (newSpeeds, currentSpeed) ->
+    @$('.video_speeds').empty()
+    @$('.video_speeds li').removeClass('active')
+    @speeds = newSpeeds
+    $.each @speeds, (index, speed) =>
+      link = $('<a>').attr(href: "#").html("#{speed}x")
+      listItem = $('<li>').attr('data-speed', speed).html(link);
+      listItem.addClass('active') if speed is currentSpeed
+      @$('.video_speeds').prepend listItem
+    @$('.video_speeds a').click @changeVideoSpeed
+
+  changeVideoSpeed: (event) =>
+    event.preventDefault()
+    unless $(event.target).parent().hasClass('active')
+      @currentSpeed = $(event.target).parent().data('speed')
+      $(@).trigger 'speedChange', $(event.target).parent().data('speed')
+      @setSpeed(parseFloat(@currentSpeed).toFixed(2).replace /\.00$/, '.0')
+
+  setSpeed: (speed) ->
+    @$('.video_speeds li').removeClass('active')
+    @$(".video_speeds li[data-speed='#{speed}']").addClass('active')
+    @$('.speeds p.active').html("#{speed}x")

common/lib/xmodule/xmodule/js/src/videoalpha/display/video_volume_control.coffee

+class @VideoVolumeControlAlpha extends SubviewAlpha
+  initialize: ->
+    @currentVolume = 100
+
+  bind: ->
+    @$('.volume').mouseenter ->
+      $(this).addClass('open')
+    @$('.volume').mouseleave ->
+      $(this).removeClass('open')
+    @$('.volume>a').click(@toggleMute)
+
+  render: ->
+    @el.prepend """
+      <div class="volume">
+        <a href="#"></a>
+        <div class="volume-slider-container">
+          <div class="volume-slider"></div>
+        </div>
+      </div>
+      """#"
+    @slider = @$('.volume-slider').slider
+      orientation: "vertical"
+      range: "min"
+      min: 0
+      max: 100
+      value: 100
+      change: @onChange
+      slide: @onChange
+
+  onChange: (event, ui) =>
+    @currentVolume = ui.value
+    $(@).trigger 'volumeChange', @currentVolume
+    @$('.volume').toggleClass 'muted', @currentVolume == 0
+
+  toggleMute: =>
+    if @currentVolume > 0
+      @previousVolume = @currentVolume
+      @slider.slider 'option', 'value', 0
+    else
+      @slider.slider 'option', 'value', @previousVolume

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

@@ -31,8 +31,15 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
   # export the grading policy
   policies_dir = export_fs.makeopendir('policies')
   course_run_policy_dir = policies_dir.makeopendir(course.location.name)
-  with course_run_policy_dir.open('grading_policy.json', 'w') as grading_policy:
-    grading_policy.write(dumps(course.definition['data']['grading_policy']))
+  if 'grading_policy' in course.definition['data']:
+    with course_run_policy_dir.open('grading_policy.json', 'w') as grading_policy:
+      grading_policy.write(dumps(course.definition['data']['grading_policy']))
+
+  # export all of the course metadata in policy.json
+  with course_run_policy_dir.open('policy.json', 'w') as course_policy:
+    policy = {}
+    policy = {'course/' + course.location.name: course.metadata}
+    course_policy.write(dumps(policy)) 
 
 
 def export_extra_content(export_fs, modulestore, course_location, category_type, dirname, file_suffix=''):

common/lib/xmodule/xmodule/templates.py

@@ -56,6 +56,10 @@ def update_templates():
     available from the installed plugins
     """
 
+    # cdodge: build up a list of all existing templates. This will be used to determine which
+    # templates have been removed from disk - and thus we need to remove from the DB
+    templates_to_delete = modulestore('direct').get_items(['i4x', 'edx', 'templates', None, None, None])
+
     for category, templates in all_templates().items():
         for template in templates:
             if 'display_name' not in template.metadata:
@@ -85,3 +89,12 @@ def update_templates():
             modulestore('direct').update_item(template_location, template.data)
             modulestore('direct').update_children(template_location, template.children)
             modulestore('direct').update_metadata(template_location, template.metadata)
+
+            # remove template from list of templates to delete
+            templates_to_delete = [t for t in templates_to_delete if t.location != template_location]
+
+    # now remove all templates which appear to have removed from disk
+    if len(templates_to_delete) > 0:
+        logging.debug('deleting dangling templates = {0}'.format(templates_to_delete))
+        for template in templates_to_delete:
+            modulestore('direct').delete_item(template.location)

common/lib/xmodule/xmodule/templates/videoalpha/default.yaml

+---
+metadata:
+    display_name: default
+    data_dir: a_made_up_name
+data: |
+  <videoalpha  youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY"/>
+children: []

common/lib/xmodule/xmodule/video_module.py

@@ -4,6 +4,8 @@ import logging
 from lxml import etree
 from pkg_resources import resource_string, resource_listdir
 
+from django.http import Http404
+
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore.xml import XMLModuleStore
@@ -13,9 +15,6 @@ from xmodule.contentstore.content import StaticContent
 import datetime
 import time
 
-import datetime
-import time
-
 log = logging.getLogger(__name__)
 
 

common/lib/xmodule/xmodule/videoalpha_module.py

+import json
+import logging
+
+from lxml import etree
+from pkg_resources import resource_string, resource_listdir
+
+from django.http import Http404
+
+from xmodule.x_module import XModule
+from xmodule.raw_module import RawDescriptor
+from xmodule.modulestore.mongo import MongoModuleStore
+from xmodule.modulestore.django import modulestore
+from xmodule.contentstore.content import StaticContent
+
+import datetime
+import time
+
+log = logging.getLogger(__name__)
+
+
+class VideoAlphaModule(XModule):
+    """
+    XML source example:
+
+        <videoalpha show_captions="true"
+            youtube="0.75:jNCf2gIqpeE,1.0:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg"
+            url_name="lecture_21_3" display_name="S19V3: Vacancies"
+        >
+            <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.mp4"/>
+            <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.webm"/>
+            <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/>
+        </videoalpha>
+    """
+    video_time = 0
+    icon_class = 'video'
+
+    js = {
+        'js': [resource_string(__name__, 'js/src/videoalpha/display/html5_video.js')],
+        'coffee':
+        [resource_string(__name__, 'js/src/time.coffee'),
+         resource_string(__name__, 'js/src/videoalpha/display.coffee')] +
+        [resource_string(__name__, 'js/src/videoalpha/display/' + filename)
+         for filename
+         in sorted(resource_listdir(__name__, 'js/src/videoalpha/display'))
+         if filename.endswith('.coffee')]}
+    css = {'scss': [resource_string(__name__, 'css/videoalpha/display.scss')]}
+    js_module_name = "VideoAlpha"
+
+    def __init__(self, system, location, definition, descriptor,
+                 instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor,
+                         instance_state, shared_state, **kwargs)
+        xmltree = etree.fromstring(self.definition['data'])
+        self.youtube_streams = xmltree.get('youtube')
+        self.sub = xmltree.get('sub')
+        self.position = 0
+        self.show_captions = xmltree.get('show_captions', 'true')
+        self.sources = {
+            'main': self._get_source(xmltree),
+            'mp4': self._get_source(xmltree, ['mp4']),
+            'webm': self._get_source(xmltree, ['webm']),
+            'ogv': self._get_source(xmltree, ['ogv']),
+        }
+        self.track = self._get_track(xmltree)
+        self.start_time, self.end_time = self._get_timeframe(xmltree)
+
+        if instance_state is not None:
+            state = json.loads(instance_state)
+            if 'position' in state:
+                self.position = int(float(state['position']))
+
+    def _get_source(self, xmltree, exts=None):
+        """Find the first valid source, which ends with one of `exts`."""
+        exts = ['mp4', 'ogv', 'avi', 'webm'] if exts is None else exts
+        condition = lambda src: any([src.endswith(ext) for ext in exts])
+        return self._get_first_external(xmltree, 'source', condition)
+
+    def _get_track(self, xmltree):
+        # find the first valid track
+        return self._get_first_external(xmltree, 'track')
+
+    def _get_first_external(self, xmltree, tag, condition=bool):
+        """Will return the first 'valid' element of the given tag.
+        'valid' means that `condition('src' attribute) == True`
+        """
+        result = None
+
+        for element in xmltree.findall(tag):
+            src = element.get('src')
+            if condition(src):
+                result = src
+                break
+        return result
+
+    def _get_timeframe(self, xmltree):
+        """ Converts 'from' and 'to' parameters in video tag to seconds.
+        If there are no parameters, returns empty string. """
+
+        def parse_time(s):
+            """Converts s in '12:34:45' format to seconds. If s is
+            None, returns empty string"""
+            if s is None:
+                return ''
+            else:
+                x = time.strptime(s, '%H:%M:%S')
+                return datetime.timedelta(hours=x.tm_hour,
+                                      minutes=x.tm_min,
+                                      seconds=x.tm_sec).total_seconds()
+
+        return parse_time(xmltree.get('from')), parse_time(xmltree.get('to'))
+
+    def handle_ajax(self, dispatch, get):
+        """Handle ajax calls to this video.
+        TODO (vshnayder): This is not being called right now, so the
+        position is not being saved.
+        """
+        log.debug(u"GET {0}".format(get))
+        log.debug(u"DISPATCH {0}".format(dispatch))
+        if dispatch == 'goto_position':
+            self.position = int(float(get['position']))
+            log.info(u"NEW POSITION {0}".format(self.position))
+            return json.dumps({'success': True})
+        raise Http404()
+
+    def get_instance_state(self):
+        return json.dumps({'position': self.position})
+
+    def get_html(self):
+        if isinstance(modulestore(), MongoModuleStore):
+            caption_asset_path = StaticContent.get_base_url_path_for_course_assets(self.location) + '/subs_'
+        else:
+            # VS[compat]
+            # cdodge: filesystem static content support.
+            caption_asset_path = "/static/{0}/subs/".format(self.metadata['data_dir'])
+
+        return self.system.render_template('videoalpha.html', {
+            'youtube_streams': self.youtube_streams,
+            'id': self.location.html_id(),
+            'sub': self.sub,
+            'sources': self.sources,
+            'track': self.track,
+            'display_name': self.display_name,
+            # TODO (cpennington): This won't work when we move to data that isn't on the filesystem
+            'data_dir': self.metadata['data_dir'],
+            'caption_asset_path': caption_asset_path,
+            'show_captions': self.show_captions,
+            'start': self.start_time,
+            'end': self.end_time
+        })
+
+
+class VideoAlphaDescriptor(RawDescriptor):
+    module_class = VideoAlphaModule
+    stores_state = True
+    template_dir_name = "videoalpha"

common/lib/xmodule/xmodule/x_module.py

@@ -515,6 +515,16 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         self._child_instances = None
         self._inherited_metadata = set()
 
+
+    # Class level variable
+    always_recalculate_grades = False
+    """
+    Return whether this descriptor always requires recalculation of grades, for
+    example if the score can change via an extrnal service, not just when the
+    student interacts with the module on the page.  A specific example is
+    FoldIt, which posts grade-changing updates through a separate API.
+    """
+
     @property
     def display_name(self):
         '''

common/static/js/capa/design-protein-2d.js

@@ -22,6 +22,15 @@
     // It calls protexIsReady with a deferred command when it has finished 
     // initialization and has drawn itself
     
+    function updateProtexField() {
+            var problem = $('#protex_container').parents('.problem');
+            var input_field = problem.find('input[type=hidden]');
+            var protex_answer = protexCheckAnswer();
+            var value = {protex_answer: protex_answer};
+            //console.log(JSON.stringify(value));
+            input_field.val(JSON.stringify(value));
+        }
+        
     protexIsReady = function() {
         //Load target shape
         var target_shape = $('#target_shape').val();
@@ -29,15 +38,18 @@
             
         //Get answer from protex and store it into the hidden input field
         //when Check button is clicked
-        var problem = $('#protex_container').parents('.problem');
-        var check_button = problem.find('input.check');
-        var input_field = problem.find('input[type=hidden]');
-        check_button.on('click', function() {
+        var fold_button = $("#fold-button");
+        fold_button.on('click', function(){
+            var problem = $('#protex_container').parents('.problem');
+            var input_field = problem.find('input[type=hidden]');
             var protex_answer = protexCheckAnswer();
             var value = {protex_answer: protex_answer};
+            //console.log(JSON.stringify(value));
             input_field.val(JSON.stringify(value));
-        });              
+        });
+        updateProtexField();              
     };
+
     
     /*function initializeProtex() {
         //Check to see if the two exported GWT functions protexSetTargetShape 

lms/djangoapps/courseware/grades.py

@@ -343,6 +343,14 @@ def get_score(course_id, user, problem_descriptor, module_creator, student_modul
            Can return None if user doesn't have access, or if something else went wrong.
     cache: A StudentModuleCache
     """
+    if problem_descriptor.always_recalculate_grades:
+        problem = module_creator(problem_descriptor)
+        d = problem.get_score()
+        if d is not None:
+            return (d['score'], d['total'])
+        else:
+            return (None, None)
+
     if not (problem_descriptor.stores_state and problem_descriptor.has_score):
         # These are not problems, and do not have a score
         return (None, None)

lms/djangoapps/courseware/module_render.py

@@ -33,7 +33,7 @@ from xmodule_modifiers import replace_course_urls, replace_static_urls, add_hist
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from statsd import statsd
 
-log = logging.getLogger("mitx.courseware")
+log = logging.getLogger(__name__)
 
 
 if settings.XQUEUE_INTERFACE.get('basic_auth') is not None:
@@ -280,6 +280,7 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
         # Make an error module
         return err_descriptor.xmodule_constructor(system)(None, None)
 
+    system.set('user_is_staff', has_access(user, descriptor.location, 'staff', course_id))
     _get_html = module.get_html
 
     if wrap_xmodule_display == True:

lms/djangoapps/foldit/models.py

+import logging
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.db import models
+
+from student.models import unique_id_for_user
+
+
+log = logging.getLogger(__name__)
+
+class Score(models.Model):
+    """
+    This model stores the scores of different users on FoldIt problems.
+    """
+    user = models.ForeignKey(User, db_index=True,
+                             related_name='foldit_scores')
+
+    # The XModule that wants to access this doesn't have access to the real
+    # userid.  Save the anonymized version so we can look up by that.
+    unique_user_id = models.CharField(max_length=50, db_index=True)
+    puzzle_id = models.IntegerField()
+    best_score = models.FloatField(db_index=True)
+    current_score = models.FloatField(db_index=True)
+    score_version = models.IntegerField()
+    created = models.DateTimeField(auto_now_add=True)
+
+
+class PuzzleComplete(models.Model):
+    """
+    This keeps track of the sets of puzzles completed by each user.
+
+    e.g. PuzzleID 1234, set 1, subset 3.  (Sets and subsets correspond to levels
+    in the intro puzzles)
+    """
+    class Meta:
+        # there should only be one puzzle complete entry for any particular
+        # puzzle for any user
+        unique_together = ('user', 'puzzle_id', 'puzzle_set', 'puzzle_subset')
+        ordering = ['puzzle_id']
+
+    user = models.ForeignKey(User, db_index=True,
+                             related_name='foldit_puzzles_complete')
+
+    # The XModule that wants to access this doesn't have access to the real
+    # userid.  Save the anonymized version so we can look up by that.
+    unique_user_id = models.CharField(max_length=50, db_index=True)
+    puzzle_id = models.IntegerField()
+    puzzle_set = models.IntegerField(db_index=True)
+    puzzle_subset = models.IntegerField(db_index=True)
+    created = models.DateTimeField(auto_now_add=True)
+
+    def __unicode__(self):
+        return "PuzzleComplete({0}, id={1}, set={2}, subset={3}, created={4})".format(
+            self.user.username, self.puzzle_id,
+            self.puzzle_set, self.puzzle_subset,
+            self.created)
+
+
+    @staticmethod
+    def completed_puzzles(anonymous_user_id):
+        """
+        Return a list of puzzles that this user has completed, as an array of
+        dicts:
+
+        [ {'set': int,
+           'subset': int,
+           'created': datetime} ]
+        """
+        complete = PuzzleComplete.objects.filter(unique_user_id=anonymous_user_id)
+        return [{'set': c.puzzle_set,
+                 'subset': c.puzzle_subset,
+                 'created': c.created} for c in complete]
+
+
+    @staticmethod
+    def is_level_complete(anonymous_user_id, level, sub_level, due=None):
+        """
+        Return True if this user completed level--sub_level by due.
+
+        Users see levels as e.g. 4-5.
+
+        Args:
+            level: int
+            sub_level: int
+            due (optional): If specified, a datetime.  Ignored if None.
+        """
+        complete = PuzzleComplete.objects.filter(unique_user_id=anonymous_user_id,
+                                                 puzzle_set=level,
+                                                 puzzle_subset=sub_level)
+        if due is not None:
+            complete = complete.filter(created__lte=due)
+
+        return complete.exists()
+

lms/djangoapps/foldit/tests.py

+import json
+import logging
+from functools import partial
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.test.client import RequestFactory
+from django.conf import settings
+from django.core.urlresolvers import reverse
+
+from foldit.views import foldit_ops, verify_code
+from foldit.models import PuzzleComplete
+from student.models import UserProfile, unique_id_for_user
+
+from datetime import datetime, timedelta
+
+log = logging.getLogger(__name__)
+
+
+class FolditTestCase(TestCase):
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.url = reverse('foldit_ops')
+
+        pwd = 'abc'
+        self.user = User.objects.create_user('testuser', 'test@test.com', pwd)
+        self.unique_user_id = unique_id_for_user(self.user)
+        now = datetime.now()
+        self.tomorrow = now + timedelta(days=1)
+        self.yesterday = now - timedelta(days=1)
+
+        UserProfile.objects.create(user=self.user)
+
+    def make_request(self, post_data):
+        request = self.factory.post(self.url, post_data)
+        request.user = self.user
+        return request
+
+    def test_SetPlayerPuzzleScores(self):
+
+        scores = [ {"PuzzleID": 994391,
+                    "ScoreType": "score",
+                    "BestScore": 0.078034,
+                    "CurrentScore":0.080035,
+                    "ScoreVersion":23}]
+        scores_str = json.dumps(scores)
+
+        verify = {"Verify": verify_code(self.user.email, scores_str),
+                  "VerifyMethod":"FoldItVerify"}
+        data = {'SetPlayerPuzzleScoresVerify': json.dumps(verify),
+                'SetPlayerPuzzleScores': scores_str}
+
+        request = self.make_request(data)
+
+        response = foldit_ops(request)
+        self.assertEqual(response.status_code, 200)
+
+        self.assertEqual(response.content, json.dumps(
+            [{"OperationID": "SetPlayerPuzzleScores",
+              "Value": [{
+                  "PuzzleID": 994391,
+                  "Status": "Success"}]}]))
+
+
+    def test_SetPlayerPuzzleScores_many(self):
+
+        scores = [ {"PuzzleID": 994391,
+                    "ScoreType": "score",
+                    "BestScore": 0.078034,
+                    "CurrentScore":0.080035,
+                    "ScoreVersion":23},
+
+                    {"PuzzleID": 994392,
+                    "ScoreType": "score",
+                    "BestScore": 0.078000,
+                    "CurrentScore":0.080011,
+                    "ScoreVersion":23}]
+
+        scores_str = json.dumps(scores)
+
+        verify = {"Verify": verify_code(self.user.email, scores_str),
+                  "VerifyMethod":"FoldItVerify"}
+        data = {'SetPlayerPuzzleScoresVerify': json.dumps(verify),
+                'SetPlayerPuzzleScores': scores_str}
+
+        request = self.make_request(data)
+
+        response = foldit_ops(request)
+        self.assertEqual(response.status_code, 200)
+
+        self.assertEqual(response.content, json.dumps(
+            [{"OperationID": "SetPlayerPuzzleScores",
+              "Value": [{
+                  "PuzzleID": 994391,
+                  "Status": "Success"},
+
+                  {"PuzzleID": 994392,
+                  "Status": "Success"}]}]))
+
+
+
+    def test_SetPlayerPuzzleScores_error(self):
+
+        scores = [ {"PuzzleID": 994391,
+                    "ScoreType": "score",
+                    "BestScore": 0.078034,
+                    "CurrentScore":0.080035,
+                    "ScoreVersion":23}]
+        validation_str = json.dumps(scores)
+
+        verify = {"Verify": verify_code(self.user.email, validation_str),
+                  "VerifyMethod":"FoldItVerify"}
+
+        # change the real string -- should get an error
+        scores[0]['ScoreVersion'] = 22
+        scores_str = json.dumps(scores)
+
+        data = {'SetPlayerPuzzleScoresVerify': json.dumps(verify),
+                'SetPlayerPuzzleScores': scores_str}
+
+        request = self.make_request(data)
+
+        response = foldit_ops(request)
+        self.assertEqual(response.status_code, 200)
+
+        response_data = json.loads(response.content)
+
+        self.assertEqual(response.content,
+                         json.dumps([{
+                             "OperationID": "SetPlayerPuzzleScores",
+                             "Success": "false",
+                             "ErrorString": "Verification failed",
+                             "ErrorCode": "VerifyFailed"}]))
+
+
+    def make_puzzles_complete_request(self, puzzles):
+        """
+        Make a puzzles complete request, given an array of
+        puzzles.  E.g.
+
+        [ {"PuzzleID": 13, "Set": 1, "SubSet": 2},
+          {"PuzzleID": 53524, "Set": 1, "SubSet": 1} ]
+        """
+        puzzles_str = json.dumps(puzzles)
+
+        verify = {"Verify": verify_code(self.user.email, puzzles_str),
+                  "VerifyMethod":"FoldItVerify"}
+
+        data =  {'SetPuzzlesCompleteVerify': json.dumps(verify),
+                'SetPuzzlesComplete': puzzles_str}
+
+        request = self.make_request(data)
+
+        response = foldit_ops(request)
+        self.assertEqual(response.status_code, 200)
+        return response
+
+    @staticmethod
+    def set_puzzle_complete_response(values):
+        return json.dumps([{"OperationID":"SetPuzzlesComplete",
+                            "Value": values}])
+
+
+    def test_SetPlayerPuzzlesComplete(self):
+
+        puzzles = [ {"PuzzleID": 13, "Set": 1, "SubSet": 2},
+                    {"PuzzleID": 53524, "Set": 1, "SubSet": 1} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertEqual(response.content,
+                         self.set_puzzle_complete_response([13, 53524]))
+
+
+
+    def test_SetPlayerPuzzlesComplete_multiple(self):
+        """Check that state is stored properly"""
+
+        puzzles = [ {"PuzzleID": 13, "Set": 1, "SubSet": 2},
+                    {"PuzzleID": 53524, "Set": 1, "SubSet": 1} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertEqual(response.content,
+                         self.set_puzzle_complete_response([13, 53524]))
+
+        puzzles = [ {"PuzzleID": 14, "Set": 1, "SubSet": 3},
+                    {"PuzzleID": 15, "Set": 1, "SubSet": 1} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertEqual(response.content,
+                         self.set_puzzle_complete_response([13, 14, 15, 53524]))
+
+
+
+    def test_SetPlayerPuzzlesComplete_level_complete(self):
+        """Check that the level complete function works"""
+
+        puzzles = [ {"PuzzleID": 13, "Set": 1, "SubSet": 2},
+                    {"PuzzleID": 53524, "Set": 1, "SubSet": 1} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertEqual(response.content,
+                         self.set_puzzle_complete_response([13, 53524]))
+
+        puzzles = [ {"PuzzleID": 14, "Set": 1, "SubSet": 3},
+                    {"PuzzleID": 15, "Set": 1, "SubSet": 1} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertEqual(response.content,
+                         self.set_puzzle_complete_response([13, 14, 15, 53524]))
+
+        is_complete = partial(
+            PuzzleComplete.is_level_complete, self.unique_user_id)
+
+        self.assertTrue(is_complete(1, 1))
+        self.assertTrue(is_complete(1, 3))
+        self.assertTrue(is_complete(1, 2))
+        self.assertFalse(is_complete(4, 5))
+
+        puzzles = [ {"PuzzleID": 74, "Set": 4, "SubSet": 5} ]
+
+        response = self.make_puzzles_complete_request(puzzles)
+
+        self.assertTrue(is_complete(4, 5))
+
+        # Now check due dates
+
+        self.assertTrue(is_complete(1, 1, due=self.tomorrow))
+        self.assertFalse(is_complete(1, 1, due=self.yesterday))
+
+
+
+    def test_SetPlayerPuzzlesComplete_error(self):
+
+        puzzles = [ {"PuzzleID": 13, "Set": 1, "SubSet": 2},
+                    {"PuzzleID": 53524, "Set": 1, "SubSet": 1} ]
+
+        puzzles_str = json.dumps(puzzles)
+
+        verify = {"Verify": verify_code(self.user.email, puzzles_str + "x"),
+                  "VerifyMethod":"FoldItVerify"}
+
+        data = {'SetPuzzlesCompleteVerify': json.dumps(verify),
+                'SetPuzzlesComplete': puzzles_str}
+
+        request = self.make_request(data)
+
+        response = foldit_ops(request)
+        self.assertEqual(response.status_code, 200)
+
+        response_data = json.loads(response.content)
+
+        self.assertEqual(response.content,
+                         json.dumps([{
+                             "OperationID": "SetPuzzlesComplete",
+                             "Success": "false",
+                             "ErrorString": "Verification failed",
+                             "ErrorCode": "VerifyFailed"}]))

lms/djangoapps/foldit/views.py

+import hashlib
+import json
+import logging
+
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse
+from django.views.decorators.http import require_POST
+from django.views.decorators.csrf import csrf_exempt
+
+from foldit.models import Score, PuzzleComplete
+from student.models import unique_id_for_user
+
+log = logging.getLogger(__name__)
+
+
+@login_required
+@csrf_exempt
+@require_POST
+def foldit_ops(request):
+    """
+    Endpoint view for foldit operations.
+    """
+    responses = []
+    if "SetPlayerPuzzleScores" in request.POST:
+        puzzle_scores_json = request.POST.get("SetPlayerPuzzleScores")
+        pz_verify_json = request.POST.get("SetPlayerPuzzleScoresVerify")
+        log.debug("SetPlayerPuzzleScores message: puzzle scores: %r",
+                  puzzle_scores_json)
+
+        puzzle_score_verify = json.loads(pz_verify_json)
+        if not verifies_ok(request.user.email,
+                           puzzle_scores_json, puzzle_score_verify):
+            responses.append({"OperationID": "SetPlayerPuzzleScores",
+                              "Success": "false",
+                              "ErrorString": "Verification failed",
+                              "ErrorCode": "VerifyFailed"})
+            log.warning("Verification of SetPlayerPuzzleScores failed:" +
+                     "user %s, scores json %r, verify %r",
+                     request.user, puzzle_scores_json, pz_verify_json)
+        else:
+            puzzle_scores = json.loads(puzzle_scores_json)
+            responses.append(save_scores(request.user, puzzle_scores))
+
+    if "SetPuzzlesComplete" in request.POST:
+        puzzles_complete_json = request.POST.get("SetPuzzlesComplete")
+        pc_verify_json = request.POST.get("SetPuzzlesCompleteVerify")
+
+        log.debug("SetPuzzlesComplete message: %r",
+                  puzzles_complete_json)
+
+        puzzles_complete_verify = json.loads(pc_verify_json)
+
+        if not verifies_ok(request.user.email,
+                           puzzles_complete_json, puzzles_complete_verify):
+            responses.append({"OperationID": "SetPuzzlesComplete",
+                              "Success": "false",
+                              "ErrorString": "Verification failed",
+                              "ErrorCode": "VerifyFailed"})
+            log.warning("Verification of SetPuzzlesComplete failed:" +
+                     " user %s, puzzles json %r, verify %r",
+                     request.user, puzzles_complete_json, pc_verify_json)
+        else:
+            puzzles_complete = json.loads(puzzles_complete_json)
+            responses.append(save_complete(request.user, puzzles_complete))
+
+    return HttpResponse(json.dumps(responses))
+
+
+def verify_code(email, val):
+    """
+    Given the email and passed in value (str), return the expected
+    verification code.
+    """
+    # TODO: is this the right string?
+    verification_string = email.lower() + '|' + val
+    return hashlib.md5(verification_string).hexdigest()
+
+
+def verifies_ok(email, val, verification):
+    """
+    Check that the hash_str matches the expected hash of val.
+
+    Returns True if verification ok, False otherwise
+    """
+    if verification.get("VerifyMethod") != "FoldItVerify":
+        log.debug("VerificationMethod in %r isn't FoldItVerify", verification)
+        return False
+    hash_str = verification.get("Verify")
+
+    return verify_code(email, val) == hash_str
+
+
+def save_scores(user, puzzle_scores):
+    score_responses = []
+    for score in puzzle_scores:
+        log.debug("score: %s", score)
+        # expected keys ScoreType, PuzzleID (int),
+        # BestScore (energy), CurrentScore (Energy), ScoreVersion (int)
+
+        puzzle_id = score['PuzzleID']
+
+        # TODO: save the score
+
+        # SetPlayerPuzzleScoreResponse object
+        score_responses.append({'PuzzleID': puzzle_id,
+                                'Status': 'Success'})
+
+    return {"OperationID": "SetPlayerPuzzleScores", "Value": score_responses}
+
+
+def save_complete(user, puzzles_complete):
+    """
+    Returned list of PuzzleIDs should be in sorted order (I don't think client
+    cares, but tests do)
+    """
+    for complete in puzzles_complete:
+        log.debug("Puzzle complete: %s", complete)
+        puzzle_id = complete['PuzzleID']
+        puzzle_set = complete['Set']
+        puzzle_subset = complete['SubSet']
+
+        # create if not there
+        PuzzleComplete.objects.get_or_create(
+            user=user,
+            unique_user_id=unique_id_for_user(user),
+            puzzle_id=puzzle_id,
+            puzzle_set=puzzle_set,
+            puzzle_subset=puzzle_subset)
+
+    # List of all puzzle ids of intro-level puzzles completed ever, including on this
+    # request
+    # TODO: this is just in this request...
+
+    complete_responses = list(pc.puzzle_id
+                              for pc in PuzzleComplete.objects.filter(user=user))
+
+    return {"OperationID": "SetPuzzlesComplete", "Value": complete_responses}

lms/envs/common.py

@@ -200,7 +200,6 @@ COURSE_TITLE = "Circuits and Electronics"
 ### Dark code. Should be enabled in local settings for devel.
 
 ENABLE_MULTICOURSE = False     # set to False to disable multicourse display (see lib.util.views.mitxhome)
-QUICKEDIT = False
 
 WIKI_ENABLED = False
 
@@ -576,6 +575,9 @@ INSTALLED_APPS = (
     'wiki.plugins.notifications',
     'course_wiki.plugins.markdownedx',
 
+    # foldit integration
+    'foldit',
+
     # For testing
     'django.contrib.admin',   # only used in DEBUG mode
 

lms/envs/dev_edx4edx.py

@@ -34,7 +34,6 @@ EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
 
 DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
-QUICKEDIT = True
 
 MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT]
 

lms/envs/edx4edx_aws.py

@@ -6,7 +6,6 @@ COURSE_TITLE = "edx4edx: edX Author Course"
 EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
 
 ### Dark code. Should be enabled in local settings for devel.
-QUICKEDIT = True
 ENABLE_MULTICOURSE = True   # set to False to disable multicourse display (see lib.util.views.mitxhome)
 ###
 PIPELINE_CSS_COMPRESSOR = None

lms/lib/dogfood/README.md

-This is a library for edx4edx, allowing users to practice writing problems. 

lms/lib/dogfood/__init__.py

-from check import *

lms/lib/dogfood/check.py

-#!/usr/bin/python
-
-from random import choice
-import string
-import traceback
-
-from django.conf import settings
-import capa.capa_problem as lcp
-from dogfood.views import update_problem
-
-
-def GenID(length=8, chars=string.letters + string.digits):
-    return ''.join([choice(chars) for i in range(length)])
-
-randomid = GenID()
-
-
-def check_problem_code(ans, the_lcp, correct_answers, false_answers):
-    """
-    ans = student's answer
-    the_lcp = LoncapaProblem instance
-
-    returns dict {'ok':is_ok,'msg': message with iframe}
-    """
-    pfn = "dog%s" % randomid
-    pfn += the_lcp.problem_id.replace('filename', '')    # add problem ID to dogfood problem name
-    update_problem(pfn, ans, filestore=the_lcp.system.filestore)
-    msg = '<hr width="100%"/>'
-    msg += '<iframe src="%s/dogfood/filename%s" width="95%%" height="400" frameborder="1">No iframe support!</iframe>' % (settings.MITX_ROOT_URL, pfn)
-    msg += '<hr width="100%"/>'
-
-    endmsg = """<p><font size="-1" color="purple">Note: if the code text box disappears after clicking on "Check",
-        please type something in the box to make it refresh properly.  This is a
-                bug with Chrome; it does not happen with Firefox.  It is being fixed.
-                </font></p>"""
-
-    is_ok = True
-    if (not correct_answers) or (not false_answers):
-        ret = {'ok': is_ok,
-               'msg': msg + endmsg,
-               }
-        return ret
-
-    try:
-        # check correctness
-        fp = the_lcp.system.filestore.open('problems/%s.xml' % pfn)
-        test_lcp = lcp.LoncapaProblem(fp, '1', system=the_lcp.system)
-
-        if not (test_lcp.grade_answers(correct_answers).get_correctness('1_2_1') == 'correct'):
-            is_ok = False
-        if (test_lcp.grade_answers(false_answers).get_correctness('1_2_1') == 'correct'):
-            is_ok = False
-    except Exception, err:
-        is_ok = False
-        msg += "<p>Error: %s</p>" % str(err).replace('<', '&#60;')
-        msg += "<p><pre>%s</pre></p>" % traceback.format_exc().replace('<', '&#60;')
-
-    ret = {'ok': is_ok,
-           'msg': msg + endmsg,
-           }
-    return ret

lms/static/sass/course/courseware/_courseware.scss

@@ -248,3 +248,17 @@ section.self-assessment {
         font-weight: bold;
     }
 }
+
+section.foldit {
+   table {
+       margin-top: 10px;
+   }
+   th {
+        text-align: center;
+   }
+   td {
+       padding-left: 5px;
+       padding-right: 5px;
+
+   }
+}
\ No newline at end of file

lms/static/sass/shared/_header.scss

@@ -101,7 +101,7 @@ header.global {
       margin-right: 5px;
 
       > a {
-        @include background-image(linear-gradient(-90deg, #fff 0%, rgb(250,250,250) 50%, rgb(237,237,237) 50%, rgb(220,220,220) 100%));
+        @include background-image(linear-gradient(#fff 0%, rgb(250,250,250) 50%, rgb(237,237,237) 50%, rgb(220,220,220) 100%));
         border: 1px solid transparent;
         border-color: rgb(200,200,200);
         @include border-radius(3px);

lms/templates/courseware/courseware.html

@@ -32,7 +32,7 @@
   <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
   <script type="text/javascript">
     document.write('\x3Cscript type="text/javascript" src="' +
-        document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
+        document.location.protocol + '//www.youtube.com/iframe_api">\x3C/script>');
   </script>
 
   <script type="text/javascript">
@@ -61,7 +61,7 @@
   </script>
 
 % if timer_expiration_duration:
-  <script type="text/javascript">  
+  <script type="text/javascript">
     var timer = {
       timer_inst : null,
       end_time : null,
@@ -79,8 +79,8 @@
         remaining_secs = remaining_secs % 3600;
         var minutes = pretty_time_string(Math.floor(remaining_secs / 60));
         remaining_secs = remaining_secs % 60;
-        var seconds = pretty_time_string(Math.floor(remaining_secs));      
-       
+        var seconds = pretty_time_string(Math.floor(remaining_secs));
+
         var remainingTimeString = hours + ":" + minutes + ":" + seconds;
         return remainingTimeString;
       },
@@ -100,11 +100,11 @@
       end : function(self) {
         clearInterval(self.timer_inst);
         // redirect to specified URL:
-        window.location = "${time_expired_redirect_url}"; 
+        window.location = "${time_expired_redirect_url}";
       }
-    }  
-    // start timer right away: 
-    timer.start(); 
+    }
+    // start timer right away:
+    timer.start();
   </script>
 % endif
 

lms/templates/dogfood.html

-<%namespace name='static' file='static_content.html'/>
-<!DOCTYPE html>
-<html>
-## -----------------------------------------------------------------------------
-## Template for lib.dogfood.views.dj_capa_problem
-##
-## Used for viewing assesment problems in "dogfood" self-evaluation mode
-## -----------------------------------------------------------------------------
-<head>
-  <link rel="stylesheet" href="${static.url('css/vendor/jquery.treeview.css')}" type="text/css" media="all" />
-##  <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
-##  <link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
-
-% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
-## <%static:css group='application'/>
-% endif
-
-% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
-##  <link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
-% endif
-
-  <script type="text/javascript" src="${static.url('js/jquery.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/swfobject/swfobject.js')}"></script>
-
-% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
- <%static:js group='application'/>
-% endif
-
-% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
-  % for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['application']['source_filenames'] ]:
-    <script type="text/javascript" src="${jsfn}"></script>
-  % endfor
-% endif
-
-## codemirror
-  <link rel="stylesheet" href="/static/css/codemirror.css" type="text/css" media="all" />
-  <script type="text/javascript" src="${ settings.LIB_URL }codemirror-compressed.js"></script>
-
-## alternate codemirror
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/lib/codemirror.js"></script>
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/mode/xml/xml.js"></script>
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/mode/python/python.js"></script>
-
-## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="/static/js/imageinput.js"></script>
-
-
-<%include file="mathjax_include.html" />
-
-</head>
-<body class="courseware">
-
-  <!--[if lt IE 9]>
-  <script src="/static/js/html5shiv.js"></script>
-  <![endif]-->
-
-<div class="courseware"></div>
-
-## -----------------------------------------------------------------------------
-## information
-
-## <hr width="100%">
-## <h2>Rendition of your problem code</h2>
-## <hr width="100%">
-
-## -----------------------------------------------------------------------------
-## rendered problem display
-
-<script>
- ${init_js} 
-</script>
-
-<style type="text/css">
-  .problem-header {display:none;}
-  .staff {display:none;}
-  .correct {        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto;
-        background: url("/static/images/correct-icon.png") center center no-repeat;
-        height: 20px;
-        position: relative;
-        top: 6px;
-        width: 25px; }
-  .incorrect{
-        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto;
-        background: url("/static/images/incorrect-icon.png") center center no-repeat;
-        height: 20px;
-        width: 20px;
-        position: relative;
-        top: 6px; }
-  .unanswered {
-        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto;
-        background: url("/static/images/unanswered-icon.png") center center no-repeat;
-        height: 14px;
-        position: relative;
-        top: 4px;
-        width: 14px; }
-}
-</style>
-
-<meta name="path_prefix" content="${MITX_ROOT_URL}">
-
-<section class="course-content">
-  <form>
-   ${phtml}
-  </form>
-</section>
-
-  <script type="text/javascript" src="${static.url('js/jquery.treeview.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery.leanModal.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery.cookie.js')}"></script>
-##  <script type="text/javascript" src="${static.url('js/video_player.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/cktsim.js')}"></script>
-
-## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="/static/js/imageinput.js"></script>
-
-  <script type="text/javascript" >
-    var codemirror_set= {};                // associative array of codemirror objects 
-  </script>
-
-  <%block name="js_extra"/>
-
-</body>
-</html>

lms/templates/foldit.html

+<section class="foldit">
+<p><strong>Due:</strong> ${due}
+
+<p>
+<strong>Status:</strong>
+% if success:
+You have successfully gotten to level ${goal_level}.
+% else:
+You have not yet gotten to level ${goal_level}.
+% endif
+</p>
+
+<h3>Completed puzzles</h3>
+
+<table>
+  <tr>
+    <th>Level</th>
+    <th>Submitted</th>
+  </tr>
+  % for puzzle in completed:
+  <tr>
+    <td>${'{0}-{1}'.format(puzzle['set'], puzzle['subset'])}</td>
+    <td>${puzzle['created'].strftime('%Y-%m-%d %H:%M')}</td>
+  </tr>
+  % endfor
+</table>
+
+</section>
\ No newline at end of file

lms/templates/gitupdate.html

-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html> <head>
-<title>edX gitupdate</title>
-</head>
-
-<body>
-<hr>
-<h1>edX gitupdate</h1>
-<hr>
-
-<h2>Coursename: ${coursename}</h2>
-
-% if msg:
-
-  ${msg}
-
-% else:
-<p>
-Do you REALLY want to overwrite all the course.xml + problems + html
-files with version from the main git repository?
-</p>
-
-<form method="post">
-<input type="submit" value="Do git update" name="gitupdate" />
-## <input type="submit" value="Cancel" name="cancel" />
-<input type="hidden" name="csrfmiddlewaretoken" value="${csrf}"/>
-</form>
-% endif
-
-<p><a href="${MITX_ROOT_URL}/courseware/">Return to site</a></p>
-
-</body> </html>

lms/templates/quickedit.html

-<%namespace name='static' file='static_content.html'/>
-<!DOCTYPE html>
-<html>
-## -----------------------------------------------------------------------------
-## Template for courseware.views.quickedit
-##
-## Used for quick-edit link present when viewing capa-format assesment problems.
-## -----------------------------------------------------------------------------
-<head>
-  <link rel="stylesheet" href="${static.url('css/vendor/jquery.treeview.css')}" type="text/css" media="all" />
-##  <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
-##  <link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
-
-% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
- <%static:css group='application'/>
-% endif
-
-% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
-##  <link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
-% endif
-
-  <script type="text/javascript" src="${static.url('js/jquery.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/swfobject/swfobject.js')}"></script>
-
-% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
- <%static:js group='application'/>
-% endif
-
-% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
-  % for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['application']['source_filenames'] ]:
-    <script type="text/javascript" src="${jsfn}"></script>
-  % endfor
-% endif
-
-## codemirror
-  <link rel="stylesheet" href="/static/css/codemirror.css" type="text/css" media="all" />
-  <script type="text/javascript" src="${ settings.LIB_URL }codemirror-compressed.js"></script>
-
-## alternate codemirror
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/lib/codemirror.js"></script>
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/mode/xml/xml.js"></script>
-##  <script type="text/javascript" src="/static/js/CodeMirror-2.25/mode/python/python.js"></script>
-
-## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="/static/js/imageinput.js"></script>
-
-##  <script type="text/javascript">
-##    var codemirror_set = {};		// track all codemirror textareas, so they can be refreshed on page changes
-##  </script>
-
-  <!--[if lt IE 9]>
-  <script src="${static.url('js/html5shiv.js')}"></script>
-  <![endif]-->
-
-<%block name="headextra"/>
-
-  <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
-       It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
-       MathJax extension libraries -->
-  <%include file="mathjax_include.html" />
-
-</head>
-<body class="courseware" style="text-align:left;" >
-
-
-<style type="text/css">
-  .CodeMirror {border-style: solid;
-              border-width: 1px;}
-.CodeMirror-scroll {
- height: 500;
- width: 100%
-}
-</style>
-
-## -----------------------------------------------------------------------------
-## information and i4x PSL code
-
-<hr width="100%">
-<h2>QuickEdit</h2>
-<hr width="100%">
-<ul>
-<li>File = ${filename}</li>
-<li>ID = ${id}</li>
-</ul>
-
-<form method="post">
-  <textarea rows="40" cols="160" name="quickedit_${id}" id="quickedit_${id}">${pxmls|h}</textarea>
-<br/>
-<input type="submit" value="Change Problem" name="qesubmit" />
-<input type="submit" value="Revert to original" name="qesubmit" />
-<input type="hidden" name="csrfmiddlewaretoken" value="${csrf}"/>
-</form>
-
-<span>${msg|n}</span>
-
-## -----------------------------------------------------------------------------
-## rendered problem display
-
-<script>
-//  height: auto;
-//  overflow-y: hidden;
-//  overflow-x: auto;
- 
-$(function(){
-  var cm = CodeMirror.fromTextArea(document.getElementById("quickedit_${id}"), 
-			{ 'mode': {name: "xml", alignCDATA: true},
-                        lineNumbers: true
-                        });
-
-// $('.my-wymeditor').wymeditor();
-
-});
-</script>
-
-<hr width="100%">
-
-<script>
-${init_js} 
-</script>
-
-<style type="text/css">
-  .staff {display:none;}
-  .correct {        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto;
-        background: url("/static/images/correct-icon.png") center center no-repeat;
-        height: 20px;
-        position: relative;
-        top: 6px;
-        width: 25px; }
-  .incorrect{
-        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto;
-        background: url("/static/images/incorrect-icon.png") center center no-repeat;
-        height: 20px;
-        width: 20px;
-        position: relative;
-        top: 6px; }
-
-}
-</style>
-
-<meta name="path_prefix" content="${MITX_ROOT_URL}">
-
-<section class="course-content">
- <div id="seq_content">
-  <form>
-   ${phtml}
-  </form>
- </div>
-</section>
-
-  <script type="text/javascript" src="${static.url('js/jquery.treeview.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery.leanModal.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/jquery.cookie.js')}"></script>
-##  <script type="text/javascript" src="${static.url('js/video_player.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/cktsim.js')}"></script>
-
-  <script type="text/javascript" >
-    var codemirror_set= {};                // associative array of codemirror objects 
-  </script>
-
-  <script type="text/javascript" src="${static.url('js/jquery.scrollTo-1.4.2-min.js')}"></script>
-
-  <%block name="js_extra"/>
-
-</body>
-</html>

lms/templates/videoalpha.html

+% if display_name is not UNDEFINED and display_name is not None:
+  <h2> ${display_name} </h2>
+% endif
+
+%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
+  <div id="stub_out_video_for_testing"></div>
+%else:
+  <div
+      id="video_${id}"
+      class="video"
+      data-streams="${youtube_streams}"
+      ${'data-sub="{}"'.format(sub) if sub else ''}
+      ${'data-mp4-source="{}"'.format(sources.get('mp4')) if sources.get('mp4') else ''}
+      ${'data-webm-source="{}"'.format(sources.get('webm')) if sources.get('webm') else ''}
+      ${'data-ogg-source="{}"'.format(sources.get('ogv')) if sources.get('ogv') else ''}
+      data-caption-data-dir="${data_dir}"
+      data-show-captions="${show_captions}"
+      data-start="${start}"
+      data-end="${end}"
+      data-caption-asset-path="${caption_asset_path}"
+  >
+    <div class="tc-wrapper">
+      <article class="video-wrapper">
+        <section class="video-player">
+          <div id="${id}"></div>
+        </section>
+        <section class="video-controls"></section>
+      </article>
+    </div>
+  </div>
+%endif
+
+% if sources.get('main'):
+<div class="video-sources">
+  <p>Download video <a href="${sources.get('main')}">here</a>.</p>
+</div>
+% endif
+
+% if track:
+<div class="video-tracks">
+  <p>Download subtitles <a href="${track}">here</a>.</p>
+</div>
+% endif

lms/urls.py

@@ -320,10 +320,6 @@ if settings.COURSEWARE_ENABLED:
         'courseware.views.static_tab', name="static_tab"),
         )
 
-if settings.QUICKEDIT:
-    urlpatterns += (url(r'^quickedit/(?P<id>[^/]*)$', 'dogfood.views.quickedit'),)
-    urlpatterns += (url(r'^dogfood/(?P<id>[^/]*)$', 'dogfood.views.df_capa_problem'),)
-
 if settings.ENABLE_JASMINE:
     urlpatterns += (url(r'^_jasmine/', include('django_jasmine.urls')),)
 
@@ -361,6 +357,12 @@ if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
         url(r'^event_logs/(?P<args>.+)$', 'track.views.view_tracking_log'),
         )
 
+# FoldIt views
+urlpatterns += (
+    # The path is hardcoded into their app...
+    url(r'^comm/foldit_ops', 'foldit.views.foldit_ops', name="foldit_ops"),
+)
+
 urlpatterns = patterns(*urlpatterns)
 
 if settings.DEBUG: