Merge pull request #718 from MITx/feature/cale/cms-drag-and-drop-children

Feature/cale/cms drag and drop children

cms/djangoapps/contentstore/views.py

@@ -276,8 +276,13 @@ def save_item(request):
     if not has_access(request.user, item_location):
         raise Http404  # TODO (vshnayder): better error
 
-    data = json.loads(request.POST['data'])
-    modulestore().update_item(item_location, data)
+    if request.POST['data']:
+        data = request.POST['data']
+        modulestore().update_item(item_location, data)
+
+    if request.POST['children']:
+        children = request.POST['children']
+        modulestore().update_children(item_location, children)
 
     # Export the course back to github
     # This uses wildcarding to find the course, which requires handling

cms/djangoapps/github_sync/__init__.py

@@ -86,7 +86,12 @@ def export_to_github(course, commit_message, author_str=None):
     If author_str is specified, uses it in the commit.
     '''
     course_dir = course.metadata.get('data_dir', course.location.course)
-    repo_settings = load_repo_settings(course_dir)
+    try:
+        repo_settings = load_repo_settings(course_dir)
+    except InvalidRepo:
+        log.warning("Invalid repo {0}, not exporting data to xml".format(course_dir))
+        return
+
     git_repo = setup_repo(repo_settings)
 
     fs = OSFS(git_repo.working_dir)

cms/static/coffee/src/models/module.coffee

@@ -2,6 +2,7 @@ class CMS.Models.Module extends Backbone.Model
   url: '/save_item'
   defaults:
     data: ''
+    children: ''
 
   loadModule: (element) ->
     elt = $(element).find('.xmodule_edit').first()
@@ -11,5 +12,5 @@ class CMS.Models.Module extends Backbone.Model
     "/edit_item?#{$.param(id: @get('id'))}"
 
   save: (args...) ->
-    @set(data: JSON.stringify(@module.save())) if @module
+    @set(data: @module.save()) if @module
     super(args...)

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

@@ -13,18 +13,22 @@ class CMS.Views.ModuleEdit extends Backbone.View
 
       # Load preview modules
       XModule.loadModules('display')
+      @$children = @$el.find('#sortable')
       @enableDrag()
 
-  enableDrag: ->
+  enableDrag: =>
       # Enable dragging things in the #sortable div (if there is one)
-      if $("#sortable").length > 0
-        $("#sortable").sortable({
+      if @$children.length > 0
+        @$children.sortable(
           placeholder: "ui-state-highlight"
-          })
-        $("#sortable").disableSelection();
-
-
-  save: (event) ->
+          update: (event, ui) =>
+            @model.set(children: @$children.find('.module-edit').map(
+                (idx, el) -> $(el).data('id')
+            ).toArray())
+        )
+        @$children.disableSelection()
+
+  save: (event) =>
     event.preventDefault()
     @model.save().done((previews) =>
       alert("Your changes have been saved.")

cms/static/sass/_base.scss

@@ -141,11 +141,15 @@ textarea {
   }
 }
 
-// .wip {
-//   outline: 1px solid #f00 !important;
-//   position: relative;
-// }
-
-.hidden {
-  display: none;
+.wip {
+  outline: 1px solid #f00 !important;
+  position: relative;
+  &:after {
+   content: "WIP";
+   font-size: 8px;
+   padding: 2px;
+   background: #f00;
+   color: #fff;
+   @include position(absolute, 0px 0px 0 0);
+  }
 }

cms/templates/widgets/week-new.html

-<section class="week-new">
-  <header>
-    <div>
-      <h1 class="editable">Week 3</h1>
-      <p><a href="#">+ new goal</a></p>
-    </div>
-
-    <section class="goals">
-      <ul>
-        <li>
-          <p><strong>Please add a goal for this section</strong> </p>
-        </li>
-      </ul>
-    </section>
-  </header>
-
-  <section class="content">
-  <section class="filters">
-    <ul>
-      <li>
-        <label for="">Sort by</label>
-        <select>
-          <option value="">Recently Modified</option>
-        </select>
-      </li>
-
-      <li>
-        <label for="">Display</label>
-        <select>
-          <option value="">All content</option>
-        </select>
-      </li>
-      <li>
-        <select>
-          <option value="">Internal Only</option>
-        </select>
-      </li>
-
-      <li class="advanced">
-        <a href="#">Advanced filters</a>
-      </li>
-
-      <li>
-        <input type="search" name="" id="" value="" />
-      </li>
-    </ul>
-  </section>
-    <div>
-    <section class="modules empty">
-      <p>This are no groups or units in this section yet</p>
-      <a href="#">Add a Group</a>
-      <a href="#">Add a Unit</a>
-    </section>
-
-  <section class="scratch-pad">
-    <ol>
-      <li>
-        <header>
-        <h2>Section Scratch</h2>
-        </header>
-        <ul>
-          <li class="empty">
-            <p><a href="#">There are no units in this scratch yet. Add one</a></p>
-          </li>
-        </ul>
-      </li>
-      <li>
-        <header>
-        <h2>Course Scratch</h2>
-        </header>
-        <ul>
-          <li>
-            <a href="" class="problem-edit">Problem title 11</a>
-            <a href="#" class="draggable">handle</a>
-          </li>
-          <li>
-            <a href="#" class="sequence-edit">Problem Group</a>
-            <a href="#" class="draggable">handle</a>
-          </li>
-          <li>
-            <a href="#" class="problem-edit">Problem title 14</a>
-            <a href="#" class="draggable">handle</a>
-          </li>
-          <li>
-            <a href="#" class="video-edit">Video 3</a>
-            <a href="#" class="draggable">handle</a>
-          </li>
-        </ul>
-      </li>
-
-      <li class="new-module">
-        <%include file="new-module.html"/>
-      </li>
-    </ol>
-  </section>
-    </div>
-  </section>
-</section>
-

common/lib/xmodule/xmodule/seq_module.py

@@ -21,7 +21,8 @@ class SequenceModule(XModule):
     ''' Layout module which lays out content in a temporal sequence
     '''
     js = {'coffee': [resource_string(__name__,
-                                     'js/src/sequence/display.coffee')]}
+                                     'js/src/sequence/display.coffee')],
+          'js': [resource_string(__name__, 'js/src/sequence/display/jquery.sequence.js')]}
     css = {'scss': [resource_string(__name__, 'css/sequence/display.scss')]}
     js_module_name = "Sequence"