Skip to content

E
edx-platform
Commit bf959d8f by ichuang
Options

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… 

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
parents f846f4c2 bdbeec9a
Showing with 330 additions and 137 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
...@@ -30,6 +31,7 @@ from django import forms ...@@ -30,6 +31,7 @@ from django import forms
from django.shortcuts import redirect from django.shortcuts import redirect
from xmodule.modulestore import Location from xmodule.modulestore import Location
from xmodule.modulestore.exceptions import ItemNotFoundError
from xmodule.x_module import ModuleSystem from xmodule.x_module import ModuleSystem
from xmodule.error_module import ErrorDescriptor from xmodule.error_module import ErrorDescriptor
from xmodule.errortracker import exc_info_to_str from xmodule.errortracker import exc_info_to_str
...@@ -40,6 +42,7 @@ from mitxmako.shortcuts import render_to_response, render_to_string ...@@ -40,6 +42,7 @@ from mitxmako.shortcuts import render_to_response, render_to_string
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule_modifiers import replace_static_urls, wrap_xmodule from xmodule_modifiers import replace_static_urls, wrap_xmodule
from xmodule.exceptions import NotFoundError from xmodule.exceptions import NotFoundError
from xmodule.timeparse import parse_time, stringify_time
from functools import partial from functools import partial
from itertools import groupby from itertools import groupby
from operator import attrgetter from operator import attrgetter
...@@ -106,9 +109,10 @@ def index(request): ...@@ -106,9 +109,10 @@ def index(request):
courses = modulestore().get_items(['i4x', None, None, 'course', None]) courses = modulestore().get_items(['i4x', None, None, 'course', None])
# filter out courses that we don't have access to # filter out courses that we don't have access to
courses = filter(lambda course: has_access(request.user, course.location), courses) courses = filter(lambda course: has_access(request.user, course.location) and course.location.course != 'templates', courses)
return render_to_response('index.html', { return render_to_response('index.html', {
'new_course_template' : Location('i4x', 'edx', 'templates', 'course', 'Empty'),
'courses': [(course.metadata.get('display_name'), 'courses': [(course.metadata.get('display_name'),
reverse('course_index', args=[ reverse('course_index', args=[
course.location.org, course.location.org,
...@@ -188,6 +192,7 @@ def edit_subsection(request, location): ...@@ -188,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':
...@@ -207,14 +212,13 @@ def edit_subsection(request, location): ...@@ -207,14 +212,13 @@ def edit_subsection(request, location):
policy_metadata = dict((key,value) for key, value in item.metadata.iteritems() policy_metadata = dict((key,value) for key, value in item.metadata.iteritems()
if key not in ['display_name', 'start', 'due', 'format'] and key not in item.system_metadata_fields) if key not in ['display_name', 'start', 'due', 'format'] and key not in item.system_metadata_fields)
logging.debug(policy_metadata)
return render_to_response('edit_subsection.html', return render_to_response('edit_subsection.html',
{'subsection': item, {'subsection': item,
'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
}) })
...@@ -240,8 +244,8 @@ def edit_unit(request, location): ...@@ -240,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)
...@@ -282,9 +286,10 @@ def edit_unit(request, location): ...@@ -282,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,
...@@ -480,20 +485,13 @@ def _xmodule_recurse(item, action): ...@@ -480,20 +485,13 @@ def _xmodule_recurse(item, action):
_xmodule_recurse(child, action) _xmodule_recurse(child, action)
action(item) action(item)
def _delete_item(item, recurse=False):
if recurse:
children = item.get_children()
for child in children:
_delete_item(child, recurse)
modulestore().delete_item(item.location);
@login_required @login_required
@expect_json @expect_json
def delete_item(request): def delete_item(request):
item_location = request.POST['id'] item_location = request.POST['id']
item_loc = Location(item_location)
# check permissions for this user within this course # check permissions for this user within this course
if not has_access(request.user, item_location): if not has_access(request.user, item_location):
...@@ -501,16 +499,28 @@ def delete_item(request): ...@@ -501,16 +499,28 @@ def delete_item(request):
# optional parameter to delete all children (default False) # optional parameter to delete all children (default False)
delete_children = request.POST.get('delete_children', False) delete_children = request.POST.get('delete_children', False)
delete_all_versions = request.POST.get('delete_all_versions', False)
item = modulestore().get_item(item_location) item = modulestore().get_item(item_location)
store = _modulestore(item_loc)
# @TODO: this probably leaves draft items dangling.
# @TODO: this probably leaves draft items dangling. My preferance would be for the semantic to be
# if item.location.revision=None, then delete both draft and published version
# if caller wants to only delete the draft than the caller should put item.location.revision='draft'
if delete_children: if delete_children:
_xmodule_recurse(item, lambda i: _modulestore(i.location).delete_item(i.location)) _xmodule_recurse(item, lambda i: store.delete_item(i.location))
else: else:
_modulestore(item.location).delete_item(item.location) store.delete_item(item.location)
# cdodge: this is a bit of a hack until I can talk with Cale about the
# semantics of delete_item whereby the store is draft aware. Right now calling
# delete_item on a vertical tries to delete the draft version leaving the
# requested delete to never occur
if item.location.revision is None and item.location.category=='vertical' and delete_all_versions:
modulestore('direct').delete_item(item.location)
return HttpResponse() return HttpResponse()
...@@ -524,13 +534,15 @@ def save_item(request): ...@@ -524,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
...@@ -560,7 +572,7 @@ def save_item(request): ...@@ -560,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()
...@@ -845,9 +857,9 @@ def asset_index(request, org, course, name): ...@@ -845,9 +857,9 @@ def asset_index(request, org, course, name):
display_info['url'] = StaticContent.get_url_path_from_location(asset_location) display_info['url'] = StaticContent.get_url_path_from_location(asset_location)
# note, due to the schema change we may not have a 'thumbnail_location' in the result set # note, due to the schema change we may not have a 'thumbnail_location' in the result set
thumbnail_location = Location(asset.get('thumbnail_location', None)) _thumbnail_location = asset.get('thumbnail_location', None)
thumbnail_location = Location(_thumbnail_location) if _thumbnail_location is not None else None
display_info['thumb_url'] = StaticContent.get_url_path_from_location(thumbnail_location) display_info['thumb_url'] = StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_location is not None else None
asset_display.append(display_info) asset_display.append(display_info)
...@@ -863,6 +875,43 @@ def asset_index(request, org, course, name): ...@@ -863,6 +875,43 @@ def asset_index(request, org, course, name):
def edge(request): def edge(request):
return render_to_response('university_profiles/edge.html', {}) return render_to_response('university_profiles/edge.html', {})
@login_required
@expect_json
def create_new_course(request):
template = Location(request.POST['template'])
org = request.POST.get('org')
number = request.POST.get('number')
display_name = request.POST.get('display_name')
dest_location = Location('i4x', org, number, 'course', Location.clean(display_name))
# see if the course already exists
existing_course = None
try:
existing_course = modulestore('direct').get_item(dest_location)
except ItemNotFoundError:
pass
if existing_course is not None:
return HttpResponse(json.dumps({'ErrMsg': 'There is already a course defined with this name.'}))
new_course = modulestore('direct').clone_item(template, dest_location)
if display_name is not None:
new_course.metadata['display_name'] = display_name
# we need a 'data_dir' for legacy reasons
new_course.metadata['data_dir'] = uuid4().hex
# set a default start date to now
new_course.metadata['start'] = stringify_time(time.gmtime())
modulestore('direct').update_metadata(new_course.location.url(), new_course.own_metadata)
create_all_course_groups(request.user, new_course.location)
return HttpResponse(json.dumps({'id': new_course.location.url()}))
@ensure_csrf_cookie @ensure_csrf_cookie
@login_required @login_required
def import_course(request, org, course, name): def import_course(request, org, course, name):
...@@ -929,4 +978,8 @@ def import_course(request, org, course, name): ...@@ -929,4 +978,8 @@ def import_course(request, org, course, name):
return render_to_response('import.html', { return render_to_response('import.html', {
'context_course': course_module, 'context_course': course_module,
'active_tab': 'import', 'active_tab': 'import',
'successful_import_redirect_url' : reverse('course_index', args=[
course_module.location.org,
course_module.location.course,
course_module.location.name])
}) })
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);
...@@ -58,6 +60,23 @@ $(document).ready(function() { ...@@ -58,6 +60,23 @@ $(document).ready(function() {
e.preventDefault(); e.preventDefault();
$('.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);
}); });
function showImportSubmit(e) { function showImportSubmit(e) {
...@@ -65,6 +84,7 @@ function showImportSubmit(e) { ...@@ -65,6 +84,7 @@ function showImportSubmit(e) {
$('.file-name-block').show(); $('.file-name-block').show();
$('.import .choose-file-button').hide(); $('.import .choose-file-button').hide();
$('.submit-button').show(); $('.submit-button').show();
$('.progress').show();
} }
function syncReleaseDate(e) { function syncReleaseDate(e) {
...@@ -110,12 +130,7 @@ function onUnitReordered() { ...@@ -110,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({
...@@ -127,6 +142,38 @@ function onUnitReordered() { ...@@ -127,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();
...@@ -241,7 +288,7 @@ function _deleteItem($el) { ...@@ -241,7 +288,7 @@ function _deleteItem($el) {
var id = $el.data('id'); var id = $el.data('id');
$.post('/delete_item', $.post('/delete_item',
{'id': id, 'delete_children' : true}, {'id': id, 'delete_children' : true, 'delete_all_versions' : true},
function(data) { function(data) {
$el.remove(); $el.remove();
}); });
...@@ -306,7 +353,7 @@ function hideModal(e) { ...@@ -306,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');
} }
} }
...@@ -406,6 +453,7 @@ function addNewSection(e) { ...@@ -406,6 +453,7 @@ function addNewSection(e) {
$newSection.find('.new-section-name-cancel').bind('click', cancelNewSection); $newSection.find('.new-section-name-cancel').bind('click', cancelNewSection);
} }
function saveNewSection(e) { function saveNewSection(e) {
e.preventDefault(); e.preventDefault();
...@@ -430,6 +478,48 @@ function cancelNewSection(e) { ...@@ -430,6 +478,48 @@ function cancelNewSection(e) {
$(this).parents('section.new-section').remove(); $(this).parents('section.new-section').remove();
} }
function addNewCourse(e) {
e.preventDefault();
var $newCourse = $($('#new-course-template').html());
$('.new-course-button').after($newCourse);
$newCourse.find('.new-course-org').focus().select();
$newCourse.find('.new-course-save').bind('click', saveNewCourse);
$newCourse.find('.new-course-cancel').bind('click', cancelNewCourse);
}
function saveNewCourse(e) {
e.preventDefault();
template = $(this).data('template');
org = $(this).prevAll('.new-course-org').val();
number = $(this).prevAll('.new-course-number').val();
display_name = $(this).prevAll('.new-course-name').val();
if (org == '' || number == '' || display_name == ''){
alert('You must specify all fields in order to create a new course.')
}
$.post('/create_new_course',
{ 'template' : template,
'org' : org,
'number' : number,
'display_name': display_name,
},
function(data) {
if (data.id != undefined)
location.reload();
else if (data.ErrMsg != undefined)
alert(data.ErrMsg);
});
}
function cancelNewCourse(e) {
e.preventDefault();
$(this).parents('section.new-course').remove();
}
function addNewSubsection(e) { function addNewSubsection(e) {
e.preventDefault(); e.preventDefault();
var $section = $(this).closest('.courseware-section'); var $section = $(this).closest('.courseware-section');
......
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/asset_index.html
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<h1>Asset Library</h1> <h1>Asset Library</h1>
<div class="page-actions"> <div class="page-actions">
<a href="#" class="upload-button">Upload New File</a> <a href="#" class="upload-button">Upload New File</a>
<input type="text" class="asset-search-input search wip-box" placeholder="search assets" /> <input type="text" class="asset-search-input search wip-box" placeholder="search assets" style="display:none"/>
</div> </div>
<article class="asset-library"> <article class="asset-library">
<table> <table>
...@@ -26,7 +26,11 @@ ...@@ -26,7 +26,11 @@
% for asset in assets: % for asset in assets:
<tr> <tr>
<td class="thumb-col"> <td class="thumb-col">
<div class="thumb"><img src="${asset['thumb_url']}"></div> <div class="thumb">
% if asset['thumb_url'] is not None:
<img src="${asset['thumb_url']}">
% endif
</div>
</td> </td>
<td class="name-col"> <td class="name-col">
<a href="${asset['url']}" class="filename">${asset['displayname']}</a> <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
......
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"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<script src="${static.url('js/vendor/jquery.cookie.js')}"></script> <script src="${static.url('js/vendor/jquery.cookie.js')}"></script>
<script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script> <script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
<script src="${static.url('js/vendor/jquery.tablednd.js')}"></script> <script src="${static.url('js/vendor/jquery.tablednd.js')}"></script>
<script src="http://malsup.github.com/jquery.form.js"></script> <script src="${static.url('js/vendor/jquery.form.js')}"></script>
<script type="text/javascript"> <script type="text/javascript">
document.write('\x3Cscript type="text/javascript" src="' + document.write('\x3Cscript type="text/javascript" src="' +
document.location.protocol + '//www.youtube.com/player_api">\x3C/script>'); document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
......
cms/templates/edit_subsection.html
...@@ -19,31 +19,31 @@ ...@@ -19,31 +19,31 @@
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="main-column"> <div class="main-column">
<article class="subsection-body window"> <article class="subsection-body window">
<div class="subsection-name-input"> <div class="subsection-name-input">
<label>Display Name:</label> <label>Display Name:</label>
<input type="text" value="${subsection.metadata['display_name']}" class="subsection-display-name-input" data-metadata-name="display_name"/> <input type="text" value="${subsection.metadata['display_name']}" class="subsection-display-name-input" data-metadata-name="display_name"/>
</div> </div>
<div> <div>
<label>Format:</label> <label>Format:</label>
<input type="text" value="${subsection.metadata['format'] if 'format' in subsection.metadata else ''}" class="unit-subtitle" data-metadata-name="format"/> <input type="text" value="${subsection.metadata['format'] if 'format' in subsection.metadata else ''}" class="unit-subtitle" data-metadata-name="format"/>
</div> </div>
<div class="unit-list"> <div class="unit-list">
<label>Units:</label> <label>Units:</label>
${units.enum_units(subsection)} ${units.enum_units(subsection)}
</div> </div>
<div> <div>
<label>Policy:</label> <label>Policy:</label>
<ol class='policy-list'> <ol class='policy-list'>
% for policy_name in policy_metadata.keys(): % for policy_name in policy_metadata.keys():
<li class="policy-list-element"> <li class="policy-list-element">
<input type="text" class="policy-list-name" name="${policy_name}" value="${policy_name}" disabled size="15"/>:&nbsp;<input type="text" class="policy-list-value" name="${policy_metadata[policy_name]}" value="${policy_metadata[policy_name]}" size="40"/><a href="#" class="delete-icon remove-policy-data"></a> <input type="text" class="policy-list-name" name="${policy_name}" value="${policy_name}" disabled size="15"/>:&nbsp;<input type="text" class="policy-list-value" name="${policy_metadata[policy_name]}" value="${policy_metadata[policy_name]}" size="40"/><a href="#" class="delete-icon remove-policy-data"></a>
</li> </li>
% endfor % endfor
<a href="#" class="new-policy-item add-policy-data"> <a href="#" class="new-policy-item add-policy-data">
<span class="plus-icon-small"></span>New Policy Data <span class="plus-icon-small"></span>New Policy Data
</a> </a>
</ol> </ol>
</div> </div>
</article> </article>
</div> </div>
...@@ -51,46 +51,52 @@ ...@@ -51,46 +51,52 @@
</div> </div>
<div id="add-new-policy-element-template" style="display:none"> <div id="add-new-policy-element-template" style="display:none">
<li class="policy-list-element new-policy-list-element"><input type="text" class="policy-list-name" autocomplete="off" size="15"/>:&nbsp;<input type="text" class="policy-list-value" size=40 autocomplete="off"/><a href="#" class="delete-icon remove-policy-data"></a></li> <li class="policy-list-element new-policy-list-element"><input type="text" class="policy-list-name" autocomplete="off" size="15"/>:&nbsp;<input type="text" class="policy-list-value" size=40 autocomplete="off"/><a href="#" class="delete-icon remove-policy-data"></a></li>
</div> </div>
<div class="sidebar"> <div class="sidebar">
<div class="unit-properties window"> <div class="unit-properties window">
<h4>Subsection Settings</h4> <h4>Subsection Settings</h4>
<div class="window-contents"> <div class="window-contents">
<div class="scheduled-date-input row"> <div class="scheduled-date-input row">
<label>Release date:<!-- <span class="description">Determines when this subsection and the units within it will be released publicly.</span>--></label> <label>Release date:<!-- <span class="description">Determines when this subsection and the units within it will be released publicly.</span>--></label>
<div class="datepair" data-language="javascript"> <div class="datepair" data-language="javascript">
<% <%
start_date = datetime.fromtimestamp(mktime(subsection.start)) if subsection.start is not None else None start_date = datetime.fromtimestamp(mktime(subsection.start)) if subsection.start is not None else None
parent_start_date = datetime.fromtimestamp(mktime(parent_item.start)) if parent_item.start is not None else None parent_start_date = datetime.fromtimestamp(mktime(parent_item.start)) if parent_item.start is not None else None
%> %>
<input type="text" id="start_date" name="start_date" value="${start_date.strftime('%m/%d/%Y') if start_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/> <input type="text" id="start_date" name="start_date" value="${start_date.strftime('%m/%d/%Y') if start_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' 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"/> <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:
% endif <p class="notice">The date above differs from the release date of ${parent_item.display_name}, which is unset.
</div> % else:
<div class="due-date-input row"> <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')}.
<label>Due date:</label> % endif
<a href="#" class="set-date">Set a due date</a> <a href="#" class="sync-date">Sync to ${parent_item.display_name}.</a></p>
<div class="datepair date-setter"> % endif
<p class="date-description"> </div>
<% <div class="due-date-input row">
# due date uses it own formatting for stringifying the date. As with capa_module.py, there's a utility module available for us to use <label>Due date:</label>
due_date = dateutil.parser.parse(subsection.metadata.get('due')) if 'due' in subsection.metadata else None <a href="#" class="set-date">Set a due date</a>
%> <div class="datepair date-setter">
<input type="text" id="due_date" name="due_date" value="${due_date.strftime('%m/%d/%Y') if due_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/> <p class="date-description">
<input type="text" id="due_time" name="due_time" value="${due_date.strftime('%H:%M') if due_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/> <%
<a href="#" class="remove-date">Remove due date</a> # due date uses it own formatting for stringifying the date. As with capa_module.py, there's a utility module available for us to use
</p> due_date = dateutil.parser.parse(subsection.metadata.get('due')) if 'due' in subsection.metadata else None
</div> %>
</div> <input type="text" id="due_date" name="due_date" value="${due_date.strftime('%m/%d/%Y') if due_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
<div class="row unit-actions"> <input type="text" id="due_time" name="due_time" value="${due_date.strftime('%H:%M') if due_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
<a href="#" class="save-button save-subsection" data-id="${subsection.location}">Save</a> <a href="#" class="remove-date">Remove due date</a>
<a href="${lms_link}" target="_blank" class="preview-button">Preview</a> </p>
</div> </div>
</div>
<div class="row unit-actions">
<a href="#" class="save-button save-subsection" data-id="${subsection.location}">Save</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> </div>
...@@ -103,13 +109,13 @@ ...@@ -103,13 +109,13 @@
<script src="${static.url('js/vendor/timepicker/datepair.js')}"></script> <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
<script src="${static.url('js/vendor/date.js')}"></script> <script src="${static.url('js/vendor/date.js')}"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
// expand the due-date area if the values are set // expand the due-date area if the values are set
if ($('#due_date').val() != '') { if ($('#due_date').val() != '') {
var $block = $('.set-date').closest('.due-date-input'); var $block = $('.set-date').closest('.due-date-input');
$('.set-date').hide(); $('.set-date').hide();
$block.find('.date-setter').show(); $block.find('.date-setter').show();
} }
}) })
</script> </script>
</%block> </%block>
cms/templates/import.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%namespace name='static' file='static_content.html'/>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Import</%block> <%block name="title">Import</%block>
<%block name="bodyclass">import</%block> <%block name="bodyclass">import</%block>
...@@ -21,6 +23,10 @@ ...@@ -21,6 +23,10 @@
<p class="file-name-block"><span class="file-name"></span><a href="#" class="choose-file-button-inline">change</a></p> <p class="file-name-block"><span class="file-name"></span><a href="#" class="choose-file-button-inline">change</a></p>
<input type="file" name="course-data" class="file-input"> <input type="file" name="course-data" class="file-input">
<input type="submit" value="Replace my course with the one above" class="submit-button"> <input type="submit" value="Replace my course with the one above" class="submit-button">
<div class="progress" style="position:relative; margin-top:5px; width:250px; height:15px; border: 1px solid #ddd; padding: 1px; border-radius: 3px; display:none;">
<div class="bar" style="background-color: #B4F5B4; width:0%; height:10px; border-radius: 3px;"></div>
<div class="percent" style="margin-top:5px;">0%</div>
</div>
</form> </form>
</article> </article>
</div> </div>
...@@ -28,7 +34,6 @@ ...@@ -28,7 +34,6 @@
</%block> </%block>
<%block name="jsextra"> <%block name="jsextra">
<script src="//malsup.github.com/jquery.form.js"></script>
<script> <script>
(function() { (function() {
...@@ -49,7 +54,12 @@ $('form').ajaxForm({ ...@@ -49,7 +54,12 @@ $('form').ajaxForm({
percent.html(percentVal); percent.html(percentVal);
}, },
complete: function(xhr) { complete: function(xhr) {
status.html(xhr.responseText); if (xhr.status == 200) {
alert('Your import has been successful.');
window.location = '${successful_import_redirect_url}';
}
else
alert('Your import has failed.\n\n' + xhr.responseText);
} }
}); });
})(); })();
......
cms/templates/index.html
...@@ -2,13 +2,28 @@ ...@@ -2,13 +2,28 @@
<%block name="bodyclass">index</%block> <%block name="bodyclass">index</%block>
<%block name="title">Courses</%block> <%block name="title">Courses</%block>
<%block name="content"> <%block name="header_extras">
<script type="text/template" id="new-course-template">
<section class="courseware-section new-course">
<header>
<div class="item-details">
<h3 class="course-info">
<input type="text" placeholder="Organization" class="new-course-org" />
<input type="text" placeholder="Course Number" class="new-course-number" />
<input type="text" placeholder="Course Name" class="new-course-name" />
<a href="#" class="new-course-save" data-template="${new_course_template}">Save</a><a href="#" class="new-course-cancel">Cancel</a></h3>
</div>
</header>
</section>
</script>
</%block>
<%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>My Courses</h1> <h1>My Courses</h1>
<article class="my-classes"> <article class="my-classes">
<a href="#" class="new-course-button wip-box"><span class="plus-icon"></span> New Course</a> <a href="#" class="new-course-button"><span class="plus-icon"></span> New Course</a>
<ul class="class-list"> <ul class="class-list">
%for course, url in courses: %for course, url in courses:
<li> <li>
......
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="wip-box">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>
......
cms/urls.py
...@@ -16,8 +16,7 @@ urlpatterns = ('', ...@@ -16,8 +16,7 @@ urlpatterns = ('',
url(r'^create_draft$', 'contentstore.views.create_draft', name='create_draft'), url(r'^create_draft$', 'contentstore.views.create_draft', name='create_draft'),
url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'), url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'),
url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'), url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'),
url(r'^create_new_course', 'contentstore.views.create_new_course', name='create_new_course'),
url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$', url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$',
'contentstore.views.course_index', name='course_index'), 'contentstore.views.course_index', name='course_index'),
......
common/lib/xmodule/xmodule/course_module.py
...@@ -16,6 +16,8 @@ log = logging.getLogger(__name__) ...@@ -16,6 +16,8 @@ log = logging.getLogger(__name__)
class CourseDescriptor(SequenceDescriptor): class CourseDescriptor(SequenceDescriptor):
module_class = SequenceModule module_class = SequenceModule
template_dir_name = 'course'
class Textbook: class Textbook:
def __init__(self, title, book_url): def __init__(self, title, book_url):
self.title = title self.title = title
...@@ -64,7 +66,6 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -64,7 +66,6 @@ class CourseDescriptor(SequenceDescriptor):
def __init__(self, system, definition=None, **kwargs): def __init__(self, system, definition=None, **kwargs):
super(CourseDescriptor, self).__init__(system, definition, **kwargs) super(CourseDescriptor, self).__init__(system, definition, **kwargs)
self.textbooks = [] self.textbooks = []
for title, book_url in self.definition['data']['textbooks']: for title, book_url in self.definition['data']['textbooks']:
try: try:
......
common/lib/xmodule/xmodule/templates.py
...@@ -31,6 +31,8 @@ def all_templates(): ...@@ -31,6 +31,8 @@ def all_templates():
templates = defaultdict(list) templates = defaultdict(list)
for category, descriptor in XModuleDescriptor.load_classes(): for category, descriptor in XModuleDescriptor.load_classes():
if category == 'course':
logging.debug(descriptor.templates())
templates[category] = descriptor.templates() templates[category] = descriptor.templates()
return templates return templates
...@@ -65,8 +67,9 @@ def update_templates(): ...@@ -65,8 +67,9 @@ def update_templates():
template_location = Location('i4x', 'edx', 'templates', category, Location.clean_for_url_name(template.metadata['display_name'])) template_location = Location('i4x', 'edx', 'templates', category, Location.clean_for_url_name(template.metadata['display_name']))
try: try:
json_data = template._asdict() json_data = {'definition': {'data': template.data, 'children' : template.children}}
json_data['location'] = template_location.dict() json_data['location'] = template_location.dict()
XModuleDescriptor.load_from_json(json_data, TemplateTestSystem()) XModuleDescriptor.load_from_json(json_data, TemplateTestSystem())
except: except:
log.warning('Unable to instantiate {cat} from template {template}, skipping'.format( log.warning('Unable to instantiate {cat} from template {template}, skipping'.format(
......
common/lib/xmodule/xmodule/templates/course/empty.yaml 0 → 100644
---
metadata:
display_name: Empty
data: { 'textbooks' : [ ], 'wiki_slug' : null }
children: []
common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
...@@ -8,7 +8,7 @@ data: | ...@@ -8,7 +8,7 @@ data: |
<p> <p>
A multiple choice response problem presents radio buttons for student A multiple choice response problem presents radio buttons for student
input. <!-->One or more of the choice may be correct.--> Correctness of input. Correctness of
input is evaluated based on expected answers specified within each input is evaluated based on expected answers specified within each
"choice" stanza. "choice" stanza.
</p> </p>
......
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