Skip to content

E
edx-platform
Commit 8a131446 by Calen Pennington
Options

First pass at integrating the new unit editing wireframes with the CMS

parent 44805ca3
Showing with 254 additions and 230 deletions
cms/djangoapps/contentstore/views.py
...@@ -118,7 +118,7 @@ def course_index(request, org, course, name): ...@@ -118,7 +118,7 @@ def course_index(request, org, course, name):
@login_required @login_required
def edit_item(request): def edit_item(request, location):
""" """
Display an editing page for the specified module. Display an editing page for the specified module.
...@@ -127,11 +127,10 @@ def edit_item(request): ...@@ -127,11 +127,10 @@ def edit_item(request):
id: A Location URL id: A Location URL
""" """
# TODO (vshnayder): change name from id to location in coffee+html as well. # TODO (vshnayder): change name from id to location in coffee+html as well.
item_location = request.GET['id'] if not has_access(request.user, location):
if not has_access(request.user, item_location):
raise Http404 # TODO (vshnayder): better error raise Http404 # TODO (vshnayder): better error
item = modulestore().get_item(item_location) item = modulestore().get_item(location)
item.get_html = wrap_xmodule(item.get_html, item, "xmodule_edit.html") item.get_html = wrap_xmodule(item.get_html, item, "xmodule_edit.html")
if settings.LMS_BASE is not None: if settings.LMS_BASE is not None:
...@@ -146,18 +145,17 @@ def edit_item(request): ...@@ -146,18 +145,17 @@ def edit_item(request):
return render_to_response('unit.html', { return render_to_response('unit.html', {
'contents': item.get_html(), 'module': item,
'js_module': item.js_module_name, 'editable_preview': get_module_previews(request, item)[0],
'category': item.category,
'url_name': item.url_name,
'previews': get_module_previews(request, item),
'metadata': item.metadata,
# TODO: It would be nice to able to use reverse here in some form, but we don't have the lms urls imported
'lms_link': lms_link,
}) })
@login_required @login_required
def delete_item(request, location):
pass
@login_required
def new_item(request): def new_item(request):
""" """
Display a page where the user can create a new item from a template Display a page where the user can create a new item from a template
...@@ -277,6 +275,7 @@ def preview_module_system(request, preview_id, descriptor): ...@@ -277,6 +275,7 @@ def preview_module_system(request, preview_id, descriptor):
preview_id (str): An identifier specifying which preview this module is used for preview_id (str): An identifier specifying which preview this module is used for
descriptor: An XModuleDescriptor descriptor: An XModuleDescriptor
""" """
return ModuleSystem( return ModuleSystem(
ajax_url=reverse('preview_dispatch', args=[preview_id, descriptor.location.url(), '']).rstrip('/'), ajax_url=reverse('preview_dispatch', args=[preview_id, descriptor.location.url(), '']).rstrip('/'),
# TODO (cpennington): Do we want to track how instructors are using the preview problems? # TODO (cpennington): Do we want to track how instructors are using the preview problems?
...@@ -323,8 +322,10 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_ ...@@ -323,8 +322,10 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_
error_msg=exc_info_to_str(sys.exc_info()) error_msg=exc_info_to_str(sys.exc_info())
).xmodule_constructor(system)(None, None) ).xmodule_constructor(system)(None, None)
module.get_html = wrap_xmodule(module.get_html, module, "xmodule_display.html")
module.get_html = wrap_xmodule(module.get_html, module, "editable_preview.html")
module.get_html = replace_static_urls( module.get_html = replace_static_urls(
wrap_xmodule(module.get_html, module, "xmodule_display.html"), module.get_html,
module.metadata.get('data_dir', module.location.course) module.metadata.get('data_dir', module.location.course)
) )
save_preview_state(request, preview_id, descriptor.location.url(), save_preview_state(request, preview_id, descriptor.location.url(),
......
cms/static/js/base.js
...@@ -6,160 +6,162 @@ var $newComponentStep1; ...@@ -6,160 +6,162 @@ var $newComponentStep1;
var $newComponentStep2; var $newComponentStep2;
$(document).ready(function() { $(document).ready(function() {
$body = $('body'); $body = $('body');
$modal = $('.history-modal'); $modal = $('.history-modal');
$modalCover = $('.modal-cover'); $modalCover = $('.modal-cover');
$newComponentItem = $('.new-component-item'); $newComponentItem = $('.new-component-item');
$newComponentStep1 = $('.new-component-step-1'); $newComponentStep1 = $('.new-component-step-1');
$newComponentStep2 = $('.new-component-step-2'); $newComponentStep2 = $('.new-component-step-2');
$newComponentButton = $('.new-component-button'); $newComponentButton = $('.new-component-button');
$('.expand-collapse-icon').bind('click', toggleSubmodules); $('.expand-collapse-icon').bind('click', toggleSubmodules);
$('.visibility-options').bind('change', setVisibility); $('.visibility-options').bind('change', setVisibility);
$body.delegate('.components .edit-button', 'click', editComponent); $body.delegate('.components .edit-button', 'click', editComponent);
$body.delegate('.component-editor .save-button, .component-editor .cancel-button', 'click', closeComponentEditor); $body.delegate('.component-editor .save-button, .component-editor .cancel-button', 'click', closeComponentEditor);
$newComponentButton.bind('click', showNewComponentForm); $newComponentButton.bind('click', showNewComponentForm);
$newComponentStep1.find('.new-component-type a').bind('click', showNewComponentProperties); $newComponentStep1.find('.new-component-type a').bind('click', showNewComponentProperties);
$newComponentStep2.find('.save-button').bind('click', saveNewComponent); $newComponentStep2.find('.save-button').bind('click', saveNewComponent);
$newComponentStep2.find('.cancel-button').bind('click', cancelNewComponent); $newComponentStep2.find('.cancel-button').bind('click', cancelNewComponent);
$('.unit-history ol a').bind('click', showHistoryModal); $('.unit-history ol a').bind('click', showHistoryModal);
$modal.bind('click', hideHistoryModal); $modal.bind('click', hideHistoryModal);
$modalCover.bind('click', hideHistoryModal); $modalCover.bind('click', hideHistoryModal);
XModule.loadModules('display');
}); });
function toggleSubmodules(e) { function toggleSubmodules(e) {
e.preventDefault(); e.preventDefault();
$(this).toggleClass('expand').toggleClass('collapse'); $(this).toggleClass('expand').toggleClass('collapse');
$(this).closest('.branch, .window').toggleClass('collapsed'); $(this).closest('.branch, .window').toggleClass('collapsed');
} }
function setVisibility(e) { function setVisibility(e) {
$(this).find('.checked').removeClass('checked'); $(this).find('.checked').removeClass('checked');
$(e.target).closest('.option').addClass('checked'); $(e.target).closest('.option').addClass('checked');
} }
function editComponent(e) { function editComponent(e) {
e.preventDefault(); e.preventDefault();
$(this).closest('li').addClass('editing').find('.component-editor').slideDown(150); $(this).closest('li').addClass('editing').find('.component-editor').slideDown(150);
} }
function closeComponentEditor(e) { function closeComponentEditor(e) {
e.preventDefault(); e.preventDefault();
$(this).closest('li').removeClass('editing').find('.component-editor').slideUp(150); $(this).closest('li').removeClass('editing').find('.component-editor').slideUp(150);
} }
function showNewComponentForm(e) { function showNewComponentForm(e) {
e.preventDefault(); e.preventDefault();
$newComponentItem.addClass('adding'); $newComponentItem.addClass('adding');
$(this).slideUp(150); $(this).slideUp(150);
$newComponentStep1.slideDown(150); $newComponentStep1.slideDown(150);
} }
function showNewComponentProperties(e) { function showNewComponentProperties(e) {
e.preventDefault(); e.preventDefault();
var displayName; var displayName;
var componentSource; var componentSource;
var selectionRange; var selectionRange;
var $renderedComponent; var $renderedComponent;
switch($(this).attr('data-type')) { switch($(this).attr('data-type')) {
case 'video': case 'video':
displayName = 'Video'; displayName = 'Video';
componentSource = '<video youtube="1.50:___,1.25:___,1.0:___,0.75:___"/>'; componentSource = '<video youtube="1.50:___,1.25:___,1.0:___,0.75:___"/>';
selectionRange = [21, 24]; selectionRange = [21, 24];
$renderedComponent = $('<div class="rendered-component"><div class="video-unit"><img src="images/video-module.png"></div></div>'); $renderedComponent = $('<div class="rendered-component"><div class="video-unit"><img src="images/video-module.png"></div></div>');
break; break;
case 'textbook': case 'textbook':
displayName = 'Textbook'; displayName = 'Textbook';
componentSource = '<customtag page="___"><impl>book</impl></customtag>'; componentSource = '<customtag page="___"><impl>book</impl></customtag>';
selectionRange = [17, 20]; selectionRange = [17, 20];
$renderedComponent = $('<div class="rendered-component"><p><span class="textbook-icon"></span>More information given in the text.</p></div>'); $renderedComponent = $('<div class="rendered-component"><p><span class="textbook-icon"></span>More information given in the text.</p></div>');
break; break;
case 'slide': case 'slide':
displayName = 'Slide'; displayName = 'Slide';
componentSource = '<customtag page="___"><customtag lecnum="___"><impl>slides</impl></customtag>'; componentSource = '<customtag page="___"><customtag lecnum="___"><impl>slides</impl></customtag>';
selectionRange = [17, 20]; selectionRange = [17, 20];
$renderedComponent = $('<div class="rendered-component"><p><span class="slides-icon"></span>Lecture Slides Handout [Clean] [Annotated]</p></div>'); $renderedComponent = $('<div class="rendered-component"><p><span class="slides-icon"></span>Lecture Slides Handout [Clean] [Annotated]</p></div>');
break; break;
case 'discussion': case 'discussion':
displayName = 'Discussion'; displayName = 'Discussion';
componentSource = '<discussion for="___" id="___" discussion_category="___"/>'; componentSource = '<discussion for="___" id="___" discussion_category="___"/>';
selectionRange = [17, 20]; selectionRange = [17, 20];
$renderedComponent = $('<div class="rendered-component"><div class="discussion-unit"><img src="images/discussion-module.png"></div></div>'); $renderedComponent = $('<div class="rendered-component"><div class="discussion-unit"><img src="images/discussion-module.png"></div></div>');
break; break;
case 'problem': case 'problem':
displayName = 'Problem'; displayName = 'Problem';
componentSource = '<problem>___</problem>'; componentSource = '<problem>___</problem>';
selectionRange = [9, 12]; selectionRange = [9, 12];
$renderedComponent = $('<div class="rendered-component"></div>'); $renderedComponent = $('<div class="rendered-component"></div>');
break; break;
case 'freeform': case 'freeform':
displayName = 'Freeform HTML'; displayName = 'Freeform HTML';
componentSource = ''; componentSource = '';
selectionRange = [0, 0]; selectionRange = [0, 0];
$renderedComponent = $('<div class="rendered-component"></div>'); $renderedComponent = $('<div class="rendered-component"></div>');
break; break;
} }
$newComponentItem.prepend($renderedComponent); $newComponentItem.prepend($renderedComponent);
$renderedComponent.slideDown(250); $renderedComponent.slideDown(250);
$newComponentStep2.find('h5').html('Edit ' + displayName + ' Component'); $newComponentStep2.find('h5').html('Edit ' + displayName + ' Component');
$newComponentStep2.find('textarea').html(componentSource); $newComponentStep2.find('textarea').html(componentSource);
setTimeout(function() { setTimeout(function() {
$newComponentStep2.find('textarea').focus().get(0).setSelectionRange(selectionRange[0], selectionRange[1]); $newComponentStep2.find('textarea').focus().get(0).setSelectionRange(selectionRange[0], selectionRange[1]);
}, 10); }, 10);
$newComponentStep1.slideUp(250); $newComponentStep1.slideUp(250);
$newComponentStep2.slideDown(250); $newComponentStep2.slideDown(250);
} }
function cancelNewComponent(e) { function cancelNewComponent(e) {
e.preventDefault(); e.preventDefault();
$newComponentStep2.slideUp(250); $newComponentStep2.slideUp(250);
$newComponentButton.slideDown(250); $newComponentButton.slideDown(250);
$newComponentItem.removeClass('adding'); $newComponentItem.removeClass('adding');
$newComponentItem.find('.rendered-component').remove(); $newComponentItem.find('.rendered-component').remove();
} }
function saveNewComponent(e) { function saveNewComponent(e) {
e.preventDefault(); e.preventDefault();
var $newComponent = $newComponentItem.clone(); var $newComponent = $newComponentItem.clone();
$newComponent.removeClass('adding').removeClass('new-component-item'); $newComponent.removeClass('adding').removeClass('new-component-item');
$newComponent.find('.new-component-step-2').removeClass('new-component-step-2').addClass('component-editor'); $newComponent.find('.new-component-step-2').removeClass('new-component-step-2').addClass('component-editor');
setTimeout(function() { setTimeout(function() {
$newComponent.find('.component-editor').slideUp(250); $newComponent.find('.component-editor').slideUp(250);
}, 10); }, 10);
$newComponent.append('<div class="component-actions"><a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a><a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a> </div><a href="#" class="drag-handle"></a>'); $newComponent.append('<div class="component-actions"><a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a><a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a> </div><a href="#" class="drag-handle"></a>');
$newComponent.find('.new-component-step-1').remove(); $newComponent.find('.new-component-step-1').remove();
$newComponent.find('.new-component-button').remove(); $newComponent.find('.new-component-button').remove();
$newComponentStep2.slideUp(250); $newComponentStep2.slideUp(250);
$newComponentButton.slideDown(250); $newComponentButton.slideDown(250);
$newComponentItem.removeClass('adding'); $newComponentItem.removeClass('adding');
$newComponentItem.find('.rendered-component').remove(); $newComponentItem.find('.rendered-component').remove();
$newComponentItem.before($newComponent); $newComponentItem.before($newComponent);
} }
function showHistoryModal(e) { function showHistoryModal(e) {
e.preventDefault(); e.preventDefault();
$modal.show(); $modal.show();
$modalCover.show(); $modalCover.show();
} }
function hideHistoryModal(e) { function hideHistoryModal(e) {
e.preventDefault(); e.preventDefault();
$modal.hide(); $modal.hide();
$modalCover.hide(); $modalCover.hide();
} }
......
cms/templates/editable_preview.html 0 → 100644
<section class='editable-preview'>
${content}
<div class="component-actions">
<a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
<a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>
</div>
<a href="#" class="drag-handle"></a>
<div class="component-editor">
<h5>Edit Video Component</h5>
<textarea class="component-source"><video youtube="1.50:q1xkuPsOY6Q,1.25:9WOY2dHz5i4,1.0:4rpg8Bq6hb4,0.75:KLim9Xkp7IY"/></textarea>
<a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
</div>
<section>
cms/templates/overview.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %>
<%block name="title">CMS Courseware Overview</%block> <%block name="title">CMS Courseware Overview</%block>
<%include file="widgets/header.html"/>
<%def name="branch(section)"> <%def name="branch(section)">
<li class="branch collapsed"> <li class="branch collapsed">
...@@ -11,54 +11,62 @@ ...@@ -11,54 +11,62 @@
<a href="#" class="draft-item"> <a href="#" class="draft-item">
<span class="${section.category}-icon"></span>${section.display_name} <span class="draft-tag">– draft</span> <span class="${section.category}-icon"></span>${section.display_name} <span class="draft-tag">– draft</span>
</a> </a>
<div class="item-actions"> ${actions(section)}
<a href="#" class="edit-button"><span class="edit-icon"></span></a>
<a href="#" class="edit-button"><span class="delete-icon"></span></a>
<a href="#" class="drag-handle"></a>
</div>
</div> </div>
<ol> <ol>
% for unit in section.get_children(): % for unit in section.get_children():
${branch(unit)} ${branch(unit)}
% endfor % endfor
${new_unit()}
</ol> </ol>
</li> </li>
</%def> </%def>
<%def name="actions(unit)">
<div class="item-actions">
<a href="${reverse('edit_item', args=[unit.location])}" class="edit-button"><span class="edit-icon"></span></a>
<a href="${reverse('delete_item', args=[unit.location])}" class="edit-button"><span class="delete-icon"></span></a>
<a href="#" class="drag-handle"></a>
</div>
</%def>
<%def name="new_unit()">
<li>
<a href="#" class="section-item new-unit-item">
<span class="plus-icon"></span>New Unit
</a>
</li>
</%def>
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Courseware</h1> <h1>Courseware</h1>
<input type="text" class="courseware-unit-search-input search" placeholder="search units" /> <input type="text" class="courseware-unit-search-input search" placeholder="search units" />
<article class="courseware-overview"> <article class="courseware-overview">
<a href="#" class="new-courseware-section-button"><span class="plus-icon"></span> New Section</a> <a href="#" class="new-courseware-section-button"><span class="plus-icon"></span> New Section</a>
% for week in weeks: % for week in weeks:
<section class="courseware-section branch"> <section class="courseware-section branch">
<header> <header>
<a href="#" class="expand-collapse-icon collapse"></a> <a href="#" class="expand-collapse-icon collapse"></a>
<div class="item-details"> <div class="item-details">
<h3>${week.display_name}</h3> <h3>${week.display_name}</h3>
<h4><strong>Unscheduled:</strong> <a href="#">click here to set</a></h4> <h4><strong>Unscheduled:</strong> <a href="#">click here to set</a></h4>
</div> </div>
<div class="item-actions"> ${actions(week)}
<a href="#" class="edit-button"><span class="edit-icon"></span></a> </header>
<a href="#" class="edit-button"><span class="delete-icon"></span></a> <ol>
<a href="#" class="drag-handle"></a> % for section in week.get_children():
</div> ${branch(section)}
</header> % endfor
<ol> ${new_unit()}
% for section in week.get_children(): </ol>
${branch(section)} </section>
% endfor % endfor
</ol> </article>
</section>
% endfor
</article>
</div>
</div> </div>
<%include file="widgets/upload_assets.html"/> <%include file="widgets/upload_assets.html"/>
</div>
<footer></footer> <footer></footer>
</%block> </%block>
cms/templates/unit.html
<section id="unit-wrapper"> <%inherit file="base.html" />
<header> <%! from django.core.urlresolvers import reverse %>
<section> <%block name="title">CMS Unit</%block>
<h1 class="editable">${url_name}</h1> <%block name="content">
<p class="${category}"><a href="#">${category}</a></p> <div class="main-wrapper">
</section> <div class="inner-wrapper">
<article class="unit-body window">
<nav class="breadcrumbs">
<ul>
<li><a href="#">Week 2</a></li>
<li><a href="#">Linearity and Superposition</a></li>
<li><span class="current-page">S3V2: Properties of Linearity</span></li>
</ul>
</nav>
${editable_preview}
</article>
<div class="actions"> <div class="sidebar">
<a href="#" class="cancel">Cancel</a> <div class="unit-properties window">
<a href="" class="save-update">Save &amp; Update</a> <h4>Properties</h4>
</div> <div class="window-contents">
</header> <div class="row"><label>Display Name:</label><input type="text" value="${module.display_name}" /></div>
<div class="row">
<section> <label>State:</label>
<section class="meta wip"> <div class="visibility-options">
<section class="status-settings"> <span class="option checked"><input type="radio" name="visibility" id="visibility-hidden" checked /><label for="visibility-hidden">Draft</label></span>
<ul> <span class="option"><input type="radio" name="visibility" id="visibility-visible" /><label for="visibility-visible">Final</label></span>
<li><a href="#" class="current">Scrap</a></li> </div>
<li><a href="#">Draft</a></li> </div>
<li><a href="#">Proofed</a></li> <div class="row">
<li><a href="#">Published</a></li> <a href="#" class="save-button">Save</a>
</ul> </div>
<a href="#" class="settings">Settings</a> </div>
</section>
<section class="author">
<dl>
<dt>Last modified:</dt>
<dd>mm/dd/yy</dd>
<dt>By</dt>
<dd>Anant Agarwal</dd>
</dl>
</section>
<section class="tags">
<div>
<h2>Tags:</h2>
<p class="editable">Click to edit</p>
</div> </div>
<div> <div class="unit-history window collapsed">
<h2>Goal</h2> <h4><a href="#" class="expand-collapse-icon expand"></a>History</h4>
<p class="editable">Click to edit</p> <div class="window-contents">
<ol>
</ol>
</div>
</div> </div>
</section> </div>
</section> </div>
${contents} </div>
% if lms_link is not None:
<a class="lms-link" href="${lms_link}">View in LMS</a> <div class="history-modal">
% endif <div class="modal-body">
<section class="previews"> <h2>S3V2: Properties of Linearity</h2>
% for preview in previews: <div class="video-unit"><img src="images/video-module.png"></div>
<section class="preview"> <p><span class="textbook-icon"></span>More information given in the text.</p>
${preview} <p><span class="slides-icon"></span>Lecture Slides Handout [Clean] [Annotated]</p>
</section> </div>
% endfor <div class="modal-actions">
</section> <a href="#" class="revert-button">Revert to this version</a>
<div class="actions"> <a href="#" class="close-button">Close</a>
<a href="" class="save-update">Save &amp; Update</a>
<a href="#" class="cancel">Cancel</a>
</div> </div>
<%include file="widgets/notes.html"/> </div>
</section>
</section> <div class="modal-cover"></div>
</%block>
cms/urls.py
...@@ -10,7 +10,8 @@ import django.contrib.auth.views ...@@ -10,7 +10,8 @@ import django.contrib.auth.views
urlpatterns = ('', urlpatterns = ('',
url(r'^$', 'contentstore.views.index', name='index'), url(r'^$', 'contentstore.views.index', name='index'),
url(r'^new_item$', 'contentstore.views.new_item', name='new_item'), url(r'^new_item$', 'contentstore.views.new_item', name='new_item'),
url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'), url(r'^edit/(?P<location>.*?)$', 'contentstore.views.edit_item', name='edit_item'),
url(r'^delete/(?P<location>.*?)$', 'contentstore.views.delete_item', name='delete_item'),
url(r'^save_item$', 'contentstore.views.save_item', name='save_item'), url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'), url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'),
url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$', url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$',
......
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