Skip to content

E
edx-platform
Commit 13e23cbb by Chris Dodge
Options

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs 

Conflicts:
	cms/templates/widgets/header.html
parents 258a467f 91fe7da4
Showing with 106 additions and 43 deletions
cms/djangoapps/contentstore/utils.py
from django.conf import settings from django.conf import settings
from xmodule.modulestore import Location from xmodule.modulestore import Location
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule.modulestore.draft import DRAFT
from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.exceptions import ItemNotFoundError
...@@ -35,13 +34,14 @@ def get_course_location_for_item(location): ...@@ -35,13 +34,14 @@ def get_course_location_for_item(location):
return location return location
def get_lms_link_for_item(location): def get_lms_link_for_item(location, preview=False):
location = Location(location) location = Location(location)
if settings.LMS_BASE is not None: if settings.LMS_BASE is not None:
lms_link = "{lms_base}/courses/{course_id}/jump_to/{location}".format( lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format(
preview='preview.' if preview else '',
lms_base=settings.LMS_BASE, lms_base=settings.LMS_BASE,
# TODO: These will need to be changed to point to the particular instance of this problem in the particular course # TODO: These will need to be changed to point to the particular instance of this problem in the particular course
course_id = modulestore().get_containing_courses(location)[0].id, course_id=modulestore().get_containing_courses(location)[0].id,
location=location, location=location,
) )
else: else:
...@@ -77,5 +77,4 @@ def compute_unit_state(unit): ...@@ -77,5 +77,4 @@ def compute_unit_state(unit):
def get_date_display(date): def get_date_display(date):
print date, type(date)
return date.strftime("%d %B, %Y at %I:%M %p") return date.strftime("%d %B, %Y at %I:%M %p")
cms/djangoapps/contentstore/views.py
...@@ -10,6 +10,7 @@ import sys ...@@ -10,6 +10,7 @@ import sys
import time import time
import tarfile import tarfile
import shutil import shutil
from datetime import datetime
from collections import defaultdict from collections import defaultdict
from uuid import uuid4 from uuid import uuid4
from lxml import etree from lxml import etree
...@@ -191,6 +192,7 @@ def edit_subsection(request, location): ...@@ -191,6 +192,7 @@ def edit_subsection(request, location):
break break
lms_link = get_lms_link_for_item(location) lms_link = get_lms_link_for_item(location)
preview_link = get_lms_link_for_item(location, preview=True)
# make sure that location references a 'sequential', otherwise return BadRequest # make sure that location references a 'sequential', otherwise return BadRequest
if item.location.category != 'sequential': if item.location.category != 'sequential':
...@@ -215,7 +217,8 @@ def edit_subsection(request, location): ...@@ -215,7 +217,8 @@ def edit_subsection(request, location):
'context_course': course, 'context_course': course,
'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'), 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
'lms_link': lms_link, 'lms_link': lms_link,
'parent_item' : parent, 'preview_link': preview_link,
'parent_item': parent,
'policy_metadata' : policy_metadata 'policy_metadata' : policy_metadata
}) })
...@@ -241,8 +244,8 @@ def edit_unit(request, location): ...@@ -241,8 +244,8 @@ def edit_unit(request, location):
course.location.course == item.location.course): course.location.course == item.location.course):
break break
# The non-draft location lms_link = get_lms_link_for_item(item.location)
lms_link = get_lms_link_for_item(item.location._replace(revision=None)) preview_lms_link = get_lms_link_for_item(item.location, preview=True)
component_templates = defaultdict(list) component_templates = defaultdict(list)
...@@ -283,9 +286,10 @@ def edit_unit(request, location): ...@@ -283,9 +286,10 @@ def edit_unit(request, location):
'unit_location': location, 'unit_location': location,
'components': components, 'components': components,
'component_templates': component_templates, 'component_templates': component_templates,
'draft_preview_link': lms_link, 'draft_preview_link': preview_lms_link,
'published_preview_link': lms_link, 'published_preview_link': lms_link,
'subsection': containing_subsection, 'subsection': containing_subsection,
'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.start))) if containing_subsection.start is not None else 'Unset',
'section': containing_section, 'section': containing_section,
'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'), 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
'unit_state': unit_state, 'unit_state': unit_state,
...@@ -530,13 +534,15 @@ def save_item(request): ...@@ -530,13 +534,15 @@ def save_item(request):
if not has_access(request.user, item_location): if not has_access(request.user, item_location):
raise PermissionDenied() raise PermissionDenied()
store = _modulestore(Location(item_location));
if request.POST['data']: if request.POST['data']:
data = request.POST['data'] data = request.POST['data']
modulestore().update_item(item_location, data) store.update_item(item_location, data)
if request.POST['children']: if request.POST['children']:
children = request.POST['children'] children = request.POST['children']
modulestore().update_children(item_location, children) store.update_children(item_location, children)
# cdodge: also commit any metadata which might have been passed along in the # cdodge: also commit any metadata which might have been passed along in the
# POST from the client, if it is there # POST from the client, if it is there
...@@ -566,7 +572,7 @@ def save_item(request): ...@@ -566,7 +572,7 @@ def save_item(request):
existing_item.metadata.update(posted_metadata) existing_item.metadata.update(posted_metadata)
# commit to datastore # commit to datastore
modulestore().update_metadata(item_location, existing_item.metadata) store.update_metadata(item_location, existing_item.metadata)
return HttpResponse() return HttpResponse()
......
cms/envs/dev.py
...@@ -53,7 +53,7 @@ DATABASES = { ...@@ -53,7 +53,7 @@ DATABASES = {
} }
} }
LMS_BASE = "http://localhost:8000" LMS_BASE = "localhost:8000"
REPOS = { REPOS = {
'edx4edx': { 'edx4edx': {
......
cms/static/js/base.js
...@@ -32,9 +32,11 @@ $(document).ready(function() { ...@@ -32,9 +32,11 @@ $(document).ready(function() {
$('.save-subsection').bind('click', saveSubsection); $('.save-subsection').bind('click', saveSubsection);
// making the unit list sortable // making the unit list sortable
$('.sortable-unit-list').sortable(); $('.sortable-unit-list').sortable({
$('.sortable-unit-list').disableSelection(); axis: 'y',
$('.sortable-unit-list').bind('sortstop', onUnitReordered); handle: '.drag-handle',
update: onUnitReordered
});
// expand/collapse methods for optional date setters // expand/collapse methods for optional date setters
$('.set-date').bind('click', showDateSetter); $('.set-date').bind('click', showDateSetter);
...@@ -59,7 +61,22 @@ $(document).ready(function() { ...@@ -59,7 +61,22 @@ $(document).ready(function() {
$('.import .file-input').click(); $('.import .file-input').click();
}); });
// Subsection reordering
$('.unit-list ol').sortable({
axis: 'y',
handle: '.section-item .drag-handle',
update: onSubsectionReordered
});
// Section reordering
$('.courseware-overview').sortable({
axis: 'y',
handle: 'header .drag-handle',
update: onSectionReordered
});
$('.new-course-button').bind('click', addNewCourse); $('.new-course-button').bind('click', addNewCourse);
}); });
function showImportSubmit(e) { function showImportSubmit(e) {
...@@ -113,12 +130,7 @@ function onUnitReordered() { ...@@ -113,12 +130,7 @@ function onUnitReordered() {
var subsection_id = $(this).data('subsection-id'); var subsection_id = $(this).data('subsection-id');
var _els = $(this).children('li:.leaf'); var _els = $(this).children('li:.leaf');
var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
var children = new Array();
for(var i=0;i<_els.length;i++) {
el = _els[i];
children[i] = $(el).data('id');
}
// call into server to commit the new order // call into server to commit the new order
$.ajax({ $.ajax({
...@@ -130,6 +142,38 @@ function onUnitReordered() { ...@@ -130,6 +142,38 @@ function onUnitReordered() {
}); });
} }
function onSubsectionReordered() {
var section_id = $(this).data('section-id');
var _els = $(this).children('li:.branch');
var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
// call into server to commit the new order
$.ajax({
url: "/save_item",
type: "POST",
dataType: "json",
contentType: "application/json",
data:JSON.stringify({ 'id' : section_id, 'metadata' : null, 'data': null, 'children' : children})
});
}
function onSectionReordered() {
var course_id = $(this).data('course-id');
var _els = $(this).children('section:.branch');
var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
// call into server to commit the new order
$.ajax({
url: "/save_item",
type: "POST",
dataType: "json",
contentType: "application/json",
data:JSON.stringify({ 'id' : course_id, 'metadata' : null, 'data': null, 'children' : children})
});
}
function getEdxTimeFromDateTimeInputs(date_id, time_id, format) { function getEdxTimeFromDateTimeInputs(date_id, time_id, format) {
var input_date = $('#'+date_id).val(); var input_date = $('#'+date_id).val();
var input_time = $('#'+time_id).val(); var input_time = $('#'+time_id).val();
...@@ -309,7 +353,7 @@ function hideModal(e) { ...@@ -309,7 +353,7 @@ function hideModal(e) {
function onKeyUp(e) { function onKeyUp(e) {
if(e.which == 87) { if(e.which == 87) {
$body.toggleClass('show-wip'); $body.toggleClass('show-wip hide-wip');
} }
} }
......
cms/static/sass/_base.scss
...@@ -217,6 +217,12 @@ code { ...@@ -217,6 +217,12 @@ code {
} }
} }
body.hide-wip {
.wip, .wip-box {
display: none !important;
}
}
body.show-wip { body.show-wip {
.wip { .wip {
outline: 1px solid #f00 !important; outline: 1px solid #f00 !important;
......
cms/static/sass/_unit.scss
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
} }
} }
.preview-button { .preview-button, .view-button {
@include white-button; @include white-button;
margin-bottom: 10px; margin-bottom: 10px;
} }
...@@ -325,7 +325,8 @@ ...@@ -325,7 +325,8 @@
.save-button, .save-button,
.preview-button, .preview-button,
.publish-button { .publish-button,
.view-button {
font-size: 11px; font-size: 11px;
margin-top: 10px; margin-top: 10px;
padding: 6px 15px 8px; padding: 6px 15px 8px;
...@@ -427,17 +428,15 @@ ...@@ -427,17 +428,15 @@
} }
.edit-state-draft { .edit-state-draft {
.visibility { .visibility,
.edit-draft-message,
.view-button {
display: none; display: none;
} }
.published-alert { .published-alert {
display: block; display: block;
} }
.edit-draft-message {
display: none;
}
} }
.edit-state-public { .edit-state-public {
...@@ -446,7 +445,8 @@ ...@@ -446,7 +445,8 @@
.component-actions, .component-actions,
.new-component-item, .new-component-item,
#published-alert, #published-alert,
.publish-draft-message { .publish-draft-message,
.preview-button {
display: none; display: none;
} }
...@@ -463,7 +463,8 @@ ...@@ -463,7 +463,8 @@
#delete-draft, #delete-draft,
#publish-draft, #publish-draft,
#published-alert, #published-alert,
#create-draft, { #create-draft,
.view-button {
display: none; display: none;
} }
} }
cms/templates/base.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<%block name="header_extras"></%block> <%block name="header_extras"></%block>
</head> </head>
<body class="<%block name='bodyclass'></%block>"> <body class="<%block name='bodyclass'></%block> hide-wip">
<%include file="widgets/header.html" args="active_tab=active_tab"/> <%include file="widgets/header.html" args="active_tab=active_tab"/>
<%include file="courseware_vendor_js.html"/> <%include file="courseware_vendor_js.html"/>
......
cms/templates/edit_subsection.html
...@@ -69,7 +69,12 @@ ...@@ -69,7 +69,12 @@
<input type="text" id="start_time" name="start_time" value="${start_date.strftime('%H:%M') if start_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/> <input type="text" id="start_time" name="start_time" value="${start_date.strftime('%H:%M') if start_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
</div> </div>
% if subsection.start != parent_item.start and subsection.start: % if subsection.start != parent_item.start and subsection.start:
<p class="notice">The date above differs from the release date of ${parent_item.display_name} – ${parent_start_date.strftime('%m/%d/%Y')} at ${parent_start_date.strftime('%H:%M')}. <a href="#" class="sync-date">Sync to ${parent_item.display_name}.</a></p> % if parent_start_date is None:
<p class="notice">The date above differs from the release date of ${parent_item.display_name}, which is unset.
% else:
<p class="notice">The date above differs from the release date of ${parent_item.display_name} – ${parent_start_date.strftime('%m/%d/%Y')} at ${parent_start_date.strftime('%H:%M')}.
% endif
<a href="#" class="sync-date">Sync to ${parent_item.display_name}.</a></p>
% endif % endif
</div> </div>
<div class="due-date-input row"> <div class="due-date-input row">
...@@ -89,7 +94,8 @@ ...@@ -89,7 +94,8 @@
</div> </div>
<div class="row unit-actions"> <div class="row unit-actions">
<a href="#" class="save-button save-subsection" data-id="${subsection.location}">Save</a> <a href="#" class="save-button save-subsection" data-id="${subsection.location}">Save</a>
<a href="${lms_link}" target="_blank" class="preview-button">Preview</a> <a href="${preview_link}" target="_blank" class="preview-button">Preview Drafts</a>
<a href="${lms_link}" target="_blank" class="preview-button">View Live</a>
</div> </div>
</div> </div>
</div> </div>
......
cms/templates/manage_users.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<p>The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional source staff below. Please note that they must have already registered and verified their account.</p> <p>The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional source staff below. Please note that they must have already registered and verified their account.</p>
</div> </div>
<div class="list-header"> <div class="list-header">
<a href="#" class="new-user-button wip-box"> <a href="#" class="new-user-button">
<span class="plus-icon"></span>New User <span class="plus-icon"></span>New User
</a> </a>
</div> </div>
......
cms/templates/overview.html
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Courseware</h1> <h1>Courseware</h1>
<div class="page-actions"></div> <div class="page-actions"></div>
<article class="courseware-overview"> <article class="courseware-overview" data-course-id="${context_course.location.url()}">
<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 section in sections: % for section in sections:
<section class="courseware-section branch" data-id="${section.location}"> <section class="courseware-section branch" data-id="${section.location}">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
<div class="item-actions"> <div class="item-actions">
<a href="#" class="delete-button delete-section-button"><span class="delete-icon"></span></a> <a href="#" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
<a href="#" class="drag-handle wip"></a> <a href="#" class="drag-handle"></a>
</div> </div>
</header> </header>
<div class="unit-list"> <div class="unit-list">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<span class="new-folder-icon"></span>New Subsection <span class="new-folder-icon"></span>New Subsection
</a> </a>
</div> </div>
<ol> <ol data-section-id="${section.location.url()}">
% for subsection in section.get_children(): % for subsection in section.get_children():
<li class="branch collapsed" data-id="${subsection.location}"> <li class="branch collapsed" data-id="${subsection.location}">
<div class="section-item"> <div class="section-item">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</div> </div>
<div class="item-actions"> <div class="item-actions">
<a href="#" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a> <a href="#" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>
<a href="#" class="drag-handle wip"></a> <a href="#" class="drag-handle"></a>
</div> </div>
</div> </div>
${units.enum_units(subsection)} ${units.enum_units(subsection)}
......
cms/templates/unit.html
...@@ -85,12 +85,13 @@ ...@@ -85,12 +85,13 @@
<p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" id="publish-draft">replace it with this draft</a>.</p> <p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" id="publish-draft">replace it with this draft</a>.</p>
</div> </div>
<div class="row status"> <div class="row status">
<p>This unit is scheduled to be released to <strong>students</strong> on <strong>${subsection.start}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p> <p>This unit is scheduled to be released to <strong>students</strong> on <strong>${release_date}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
</div> </div>
<div class="row unit-actions"> <div class="row unit-actions">
<a id="save-draft" href="#" class="save-button">Save Draft</a> <a id="save-draft" href="#" class="save-button">Save Draft</a>
<a id="delete-draft" href="#" class="save-button">Delete Draft</a> <a id="delete-draft" href="#" class="save-button">Delete Draft</a>
<a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a> <a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a>
<a href="${published_preview_link}" target="_blank" class="view-button">View Live</a>
</div> </div>
</div> </div>
</div> </div>
......
cms/templates/widgets/header.html
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" class="class-name">${context_course.display_name}</a> <a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" class="class-name">${context_course.display_name}</a>
<ul class="class-nav"> <ul class="class-nav">
<li><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='courseware-tab'>Courseware</a></li> <li><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='courseware-tab'>Courseware</a></li>
<li><a href="${reverse('static_pages', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}" id='pages-tab'>Pages</a></li> <li><a href="${reverse('static_pages', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}" id='pages-tab' class="wip-box">Pages</a></li>
<li><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='assets-tab'>Assets</a></li> <li><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='assets-tab'>Assets</a></li>
<li><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}" id='users-tab'>Users</a></li> <li><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}" id='users-tab'>Users</a></li>
<li><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='import-tab' class="">Import</a></li> <li><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='import-tab'>Import</a></li>
</ul> </ul>
% endif % endif
</div> </div>
......
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