Commit 5fc5587f by Christina Roberts

Merge pull request #1266 from edx/talbs/studio-dnd

Studio: Drag and Drop Container
parents 4879b06c bbe906f7
...@@ -284,7 +284,7 @@ define(["domReady", "jquery", "jquery.ui", "gettext", "js/views/feedback_notific ...@@ -284,7 +284,7 @@ define(["domReady", "jquery", "jquery.ui", "gettext", "js/views/feedback_notific
$(ele).data('child-selector', type); $(ele).data('child-selector', type);
var draggable = new Draggabilly(ele, { var draggable = new Draggabilly(ele, {
handle: handleClass, handle: handleClass,
axis: 'y' containment: '.wrapper-dnd'
}); });
draggable.on('dragStart', _.bind(overviewDragger.onDragStart, overviewDragger)); draggable.on('dragStart', _.bind(overviewDragger.onDragStart, overviewDragger));
draggable.on('dragMove', _.bind(overviewDragger.onDragMove, overviewDragger)); draggable.on('dragMove', _.bind(overviewDragger.onDragMove, overviewDragger));
......
...@@ -21,10 +21,12 @@ ...@@ -21,10 +21,12 @@
<label>${_("Display Name:")}</label> <label>${_("Display Name:")}</label>
<input type="text" value="${subsection.display_name_with_default | h}" class="subsection-display-name-input" data-metadata-name="display_name"/> <input type="text" value="${subsection.display_name_with_default | h}" class="subsection-display-name-input" data-metadata-name="display_name"/>
</div> </div>
<div class="wrapper-dnd">
<div class="sortable-unit-list"> <div class="sortable-unit-list">
<label>${_("Units:")}</label> <label>${_("Units:")}</label>
${units.enum_units(subsection, subsection_units=subsection_units)} ${units.enum_units(subsection, subsection_units=subsection_units)}
</div> </div>
</div>
</article> </article>
</div> </div>
......
...@@ -138,6 +138,8 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v ...@@ -138,6 +138,8 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="wrapper-dnd">
<article class="courseware-overview" data-id="${context_course.location.url()}"> <article class="courseware-overview" data-id="${context_course.location.url()}">
% for section in sections: % for section in sections:
<section class="courseware-section branch is-draggable" data-id="${section.location}" data-parent-id="${context_course.location.url()}"> <section class="courseware-section branch is-draggable" data-id="${section.location}" data-parent-id="${context_course.location.url()}">
...@@ -221,6 +223,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v ...@@ -221,6 +223,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
</article> </article>
</div> </div>
</div> </div>
</div>
<footer></footer> <footer></footer>
<div class="edit-subsection-publish-settings"> <div class="edit-subsection-publish-settings">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment