diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py index ef60a0c1b3..b2ee3bf9c8 100644 --- a/cms/djangoapps/contentstore/course_info_model.py +++ b/cms/djangoapps/contentstore/course_info_model.py @@ -4,7 +4,6 @@ from xmodule.modulestore.django import modulestore from lxml import etree import re from django.http import HttpResponseBadRequest -from contentstore.utils import get_modulestore ## TODO store as array of { date, content } and override course_info_module.definition_from_xml ## This should be in a class which inherits from XmlDescriptor @@ -14,10 +13,10 @@ def get_course_updates(location): [{id : location.url() + idx to make unique, date : string, content : html string}] """ try: - course_updates = get_modulestore(location).get_item(location) + course_updates = modulestore('direct').get_item(location) except ItemNotFoundError: template = Location(['i4x', 'edx', "templates", 'course_info', "Empty"]) - course_updates = get_modulestore(location).clone_item(template, Location(location)) + course_updates = modulestore('direct').clone_item(template, Location(location)) # current db rep: {"_id" : locationjson, "definition" : { "data" : "
    [

  1. date

    content
    2. ]
"} "metadata" : ignored} location_base = course_updates.location.url() @@ -54,7 +53,7 @@ def update_course_updates(location, update, passed_id=None): into the html structure. """ try: - course_updates = get_modulestore(location).get_item(location) + course_updates = modulestore('direct').get_item(location) except ItemNotFoundError: return HttpResponseBadRequest @@ -94,13 +93,13 @@ def update_course_updates(location, update, passed_id=None): date_element = etree.SubElement(element, "h2") date_element.text = update['date'] if new_html_parsed is not None: - element[1] = new_html_parsed + element.append(new_html_parsed) else: date_element.tail = update['content'] # update db record course_updates.definition['data'] = etree.tostring(course_html_parsed) - get_modulestore(location).update_item(location, course_updates.definition['data']) + modulestore('direct').update_item(location, course_updates.definition['data']) return {"id" : passed_id, "date" : update['date'], @@ -115,7 +114,7 @@ def delete_course_update(location, update, passed_id): return HttpResponseBadRequest try: - course_updates = get_modulestore(location).get_item(location) + course_updates = modulestore('direct').get_item(location) except ItemNotFoundError: return HttpResponseBadRequest @@ -134,7 +133,7 @@ def delete_course_update(location, update, passed_id): # update db record course_updates.definition['data'] = etree.tostring(course_html_parsed) - store = get_modulestore(location) + store = modulestore('direct') store.update_item(location, course_updates.definition['data']) return get_course_updates(location) diff --git a/cms/djangoapps/contentstore/management/commands/xlint.py b/cms/djangoapps/contentstore/management/commands/xlint.py new file mode 100644 index 0000000000..6bc254a1ff --- /dev/null +++ b/cms/djangoapps/contentstore/management/commands/xlint.py @@ -0,0 +1,28 @@ +from django.core.management.base import BaseCommand, CommandError +from xmodule.modulestore.xml_importer import perform_xlint +from xmodule.modulestore.django import modulestore +from xmodule.contentstore.django import contentstore + + +unnamed_modules = 0 + + +class Command(BaseCommand): + help = \ + ''' + Verify the structure of courseware as to it's suitability for import + To run test: rake cms:xlint DATA_DIR=../data [COURSE_DIR=content-edx-101 (optional parameter)] + ''' + def handle(self, *args, **options): + if len(args) == 0: + raise CommandError("import requires at least one argument: [...]") + + data_dir = args[0] + if len(args) > 1: + course_dirs = args[1:] + else: + course_dirs = None + print "Importing. Data_dir={data}, course_dirs={courses}".format( + data=data_dir, + courses=course_dirs) + perform_xlint(data_dir, course_dirs, load_error_modules=False) diff --git a/cms/djangoapps/contentstore/module_info_model.py b/cms/djangoapps/contentstore/module_info_model.py new file mode 100644 index 0000000000..cd07e4556d --- /dev/null +++ b/cms/djangoapps/contentstore/module_info_model.py @@ -0,0 +1,83 @@ +import logging + +from xmodule.modulestore.exceptions import ItemNotFoundError +from xmodule.modulestore import Location +from xmodule.modulestore.django import modulestore +from lxml import etree +import re +from django.http import HttpResponseBadRequest, Http404 + +def get_module_info(store, location, parent_location = None): + try: + if location.revision is None: + module = store.get_item(location) + else: + module = store.get_item(location) + except ItemNotFoundError: + raise Http404 + + return { + 'id': module.location.url(), + 'data': module.definition['data'], + 'metadata': module.metadata + } + +def set_module_info(store, location, post_data): + module = None + isNew = False + try: + if location.revision is None: + module = store.get_item(location) + else: + module = store.get_item(location) + except: + pass + + if module is None: + # new module at this location + # presume that we have an 'Empty' template + template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty']) + module = store.clone_item(template_location, location) + isNew = True + + logging.debug('post = {0}'.format(post_data)) + + if post_data.get('data') is not None: + data = post_data['data'] + logging.debug('data = {0}'.format(data)) + store.update_item(location, data) + + # cdodge: note calling request.POST.get('children') will return None if children is an empty array + # so it lead to a bug whereby the last component to be deleted in the UI was not actually + # deleting the children object from the children collection + if 'children' in post_data and post_data['children'] is not None: + children = post_data['children'] + store.update_children(location, children) + + # cdodge: also commit any metadata which might have been passed along in the + # POST from the client, if it is there + # NOTE, that the postback is not the complete metadata, as there's system metadata which is + # not presented to the end-user for editing. So let's fetch the original and + # 'apply' the submitted metadata, so we don't end up deleting system metadata + if post_data.get('metadata') is not None: + posted_metadata = post_data['metadata'] + + # update existing metadata with submitted metadata (which can be partial) + # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it' + for metadata_key in posted_metadata.keys(): + + # let's strip out any metadata fields from the postback which have been identified as system metadata + # and therefore should not be user-editable, so we should accept them back from the client + if metadata_key in module.system_metadata_fields: + del posted_metadata[metadata_key] + elif posted_metadata[metadata_key] is None: + # remove both from passed in collection as well as the collection read in from the modulestore + if metadata_key in module.metadata: + del module.metadata[metadata_key] + del posted_metadata[metadata_key] + + # overlay the new metadata over the modulestore sourced collection to support partial updates + module.metadata.update(posted_metadata) + + # commit to datastore + store.update_metadata(location, module.metadata) diff --git a/cms/djangoapps/contentstore/tests/factories.py b/cms/djangoapps/contentstore/tests/factories.py new file mode 100644 index 0000000000..3274477098 --- /dev/null +++ b/cms/djangoapps/contentstore/tests/factories.py @@ -0,0 +1,113 @@ +from factory import Factory +from xmodule.modulestore import Location +from xmodule.modulestore.django import modulestore +from time import gmtime +from uuid import uuid4 +from xmodule.timeparse import stringify_time + + +def XMODULE_COURSE_CREATION(class_to_create, **kwargs): + return XModuleCourseFactory._create(class_to_create, **kwargs) + +def XMODULE_ITEM_CREATION(class_to_create, **kwargs): + return XModuleItemFactory._create(class_to_create, **kwargs) + +class XModuleCourseFactory(Factory): + """ + Factory for XModule courses. + """ + + ABSTRACT_FACTORY = True + _creation_function = (XMODULE_COURSE_CREATION,) + + @classmethod + def _create(cls, target_class, *args, **kwargs): + + template = Location('i4x', 'edx', 'templates', 'course', 'Empty') + org = kwargs.get('org') + number = kwargs.get('number') + display_name = kwargs.get('display_name') + location = Location('i4x', org, number, + 'course', Location.clean(display_name)) + + store = modulestore('direct') + + # Write the data to the mongo datastore + new_course = store.clone_item(template, location) + + # This metadata code was copied from cms/djangoapps/contentstore/views.py + if display_name is not None: + new_course.metadata['display_name'] = display_name + + new_course.metadata['data_dir'] = uuid4().hex + new_course.metadata['start'] = stringify_time(gmtime()) + new_course.tabs = [{"type": "courseware"}, + {"type": "course_info", "name": "Course Info"}, + {"type": "discussion", "name": "Discussion"}, + {"type": "wiki", "name": "Wiki"}, + {"type": "progress", "name": "Progress"}] + + # Update the data in the mongo datastore + store.update_metadata(new_course.location.url(), new_course.own_metadata) + + return new_course + +class Course: + pass + +class CourseFactory(XModuleCourseFactory): + FACTORY_FOR = Course + + template = 'i4x://edx/templates/course/Empty' + org = 'MITx' + number = '999' + display_name = 'Robot Super Course' + +class XModuleItemFactory(Factory): + """ + Factory for XModule items. + """ + + ABSTRACT_FACTORY = True + _creation_function = (XMODULE_ITEM_CREATION,) + + @classmethod + def _create(cls, target_class, *args, **kwargs): + + DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info'] + + parent_location = Location(kwargs.get('parent_location')) + template = Location(kwargs.get('template')) + display_name = kwargs.get('display_name') + + store = modulestore('direct') + + # This code was based off that in cms/djangoapps/contentstore/views.py + parent = store.get_item(parent_location) + dest_location = parent_location._replace(category=template.category, name=uuid4().hex) + + new_item = store.clone_item(template, dest_location) + + # TODO: This needs to be deleted when we have proper storage for static content + new_item.metadata['data_dir'] = parent.metadata['data_dir'] + + # replace the display name with an optional parameter passed in from the caller + if display_name is not None: + new_item.metadata['display_name'] = display_name + + store.update_metadata(new_item.location.url(), new_item.own_metadata) + + if new_item.location.category not in DETACHED_CATEGORIES: + store.update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()]) + + return new_item + +class Item: + pass + +class ItemFactory(XModuleItemFactory): + FACTORY_FOR = Item + + parent_location = 'i4x://MITx/999/course/Robot_Super_Course' + template = 'i4x://edx/templates/chapter/Empty' + display_name = 'Section One' \ No newline at end of file diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index b0bb6c86a1..f5ce0b3692 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -1,7 +1,6 @@ import json from django.test import TestCase from django.test.client import Client -from mock import patch, Mock from override_settings import override_settings from django.conf import settings from django.core.urlresolvers import reverse @@ -9,11 +8,10 @@ from path import path from student.models import Registration from django.contrib.auth.models import User -from xmodule.modulestore.django import modulestore import xmodule.modulestore.django -from xmodule.modulestore import Location from xmodule.modulestore.xml_importer import import_from_xml import copy +from factories import * def parse_json(response): @@ -22,33 +20,33 @@ def parse_json(response): def user(email): - '''look up a user by email''' + """look up a user by email""" return User.objects.get(email=email) def registration(email): - '''look up registration object by email''' + """look up registration object by email""" return Registration.objects.get(user__email=email) class ContentStoreTestCase(TestCase): def _login(self, email, pw): - '''Login. View should always return 200. The success/fail is in the - returned json''' + """Login. View should always return 200. The success/fail is in the + returned json""" resp = self.client.post(reverse('login_post'), {'email': email, 'password': pw}) self.assertEqual(resp.status_code, 200) return resp def login(self, email, pw): - '''Login, check that it worked.''' + """Login, check that it worked.""" resp = self._login(email, pw) data = parse_json(resp) self.assertTrue(data['success']) return resp def _create_account(self, username, email, pw): - '''Try to create an account. No error checking''' + """Try to create an account. No error checking""" resp = self.client.post('/create_account', { 'username': username, 'email': email, @@ -62,7 +60,7 @@ class ContentStoreTestCase(TestCase): return resp def create_account(self, username, email, pw): - '''Create the account and check that it worked''' + """Create the account and check that it worked""" resp = self._create_account(username, email, pw) self.assertEqual(resp.status_code, 200) data = parse_json(resp) @@ -74,8 +72,8 @@ class ContentStoreTestCase(TestCase): return resp def _activate_user(self, email): - '''Look up the activation key for the user, then hit the activate view. - No error checking''' + """Look up the activation key for the user, then hit the activate view. + No error checking""" activation_key = registration(email).activation_key # and now we try to activate @@ -220,12 +218,6 @@ class ContentStoreTest(TestCase): 'display_name': 'Robot Super Course', } - self.section_data = { - 'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course', - 'template' : 'i4x://edx/templates/chapter/Empty', - 'display_name': 'Section One', - } - def tearDown(self): # Make sure you flush out the test modulestore after the end # of the last test because otherwise on the next run @@ -262,6 +254,16 @@ class ContentStoreTest(TestCase): self.assertEqual(data['ErrMsg'], 'There is already a course defined with the same organization and course number.') + def test_create_course_with_bad_organization(self): + """Test new course creation - error path for bad organization name""" + self.course_data['org'] = 'University of California, Berkeley' + resp = self.client.post(reverse('create_new_course'), self.course_data) + data = parse_json(resp) + + self.assertEqual(resp.status_code, 200) + self.assertEqual(data['ErrMsg'], + "Unable to create course 'Robot Super Course'.\n\nInvalid characters in 'University of California, Berkeley'.") + def test_course_index_view_with_no_courses(self): """Test viewing the index page with no courses""" # Create a course so there is something to view @@ -271,20 +273,27 @@ class ContentStoreTest(TestCase): status_code=200, html=True) + def test_course_factory(self): + course = CourseFactory.create() + self.assertIsInstance(course, xmodule.course_module.CourseDescriptor) + + def test_item_factory(self): + course = CourseFactory.create() + item = ItemFactory.create(parent_location=course.location) + self.assertIsInstance(item, xmodule.seq_module.SequenceDescriptor) + def test_course_index_view_with_course(self): """Test viewing the index page with an existing course""" - # Create a course so there is something to view - resp = self.client.post(reverse('create_new_course'), self.course_data) + CourseFactory.create(display_name='Robot Super Educational Course') resp = self.client.get(reverse('index')) self.assertContains(resp, - 'Robot Super Course', + 'Robot Super Educational Course', status_code=200, html=True) def test_course_overview_view_with_course(self): """Test viewing the course overview page with an existing course""" - # Create a course so there is something to view - resp = self.client.post(reverse('create_new_course'), self.course_data) + CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') data = { 'org': 'MITx', @@ -300,8 +309,15 @@ class ContentStoreTest(TestCase): def test_clone_item(self): """Test cloning an item. E.g. creating a new section""" - resp = self.client.post(reverse('create_new_course'), self.course_data) - resp = self.client.post(reverse('clone_item'), self.section_data) + CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + + section_data = { + 'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course', + 'template' : 'i4x://edx/templates/chapter/Empty', + 'display_name': 'Section One', + } + + resp = self.client.post(reverse('clone_item'), section_data) self.assertEqual(resp.status_code, 200) data = parse_json(resp) @@ -323,3 +339,4 @@ class ContentStoreTest(TestCase): def test_edit_unit_full(self): self.check_edit_unit('full') + diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index df0b36c920..d2f19802af 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -1,53 +1,59 @@ -from .utils import get_course_location_for_item, get_lms_link_for_item, \ - compute_unit_state, get_date_display, UnitState -# to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz' -from PIL import Image -from auth.authz import INSTRUCTOR_ROLE_NAME, STAFF_ROLE_NAME, \ - create_all_course_groups, get_user_by_email, add_user_to_course_group, \ - remove_user_from_course_group, is_user_in_course_group_role, \ - get_users_in_course_group_by_role -from cache_toolbox.core import del_cached_content -from collections import defaultdict -from datetime import datetime -from django.conf import settings -from django.contrib.auth.decorators import login_required -from django.core.context_processors import csrf -from django.core.exceptions import PermissionDenied -from django.core.urlresolvers import reverse -from django.http import HttpResponse, Http404, HttpResponseBadRequest, \ - HttpResponseForbidden -from django_future.csrf import ensure_csrf_cookie -from external_auth.views import ssl_login_shortcut -from functools import partial -from mitxmako.shortcuts import render_to_response, render_to_string -from path import path -from static_replace import replace_urls from util.json_request import expect_json -from uuid import uuid4 -from xmodule.contentstore.content import StaticContent -from xmodule.contentstore.django import contentstore -from xmodule.error_module import ErrorDescriptor -from xmodule.errortracker import exc_info_to_str -from xmodule.exceptions import NotFoundError -from xmodule.modulestore import Location -from xmodule.modulestore.django import modulestore -from xmodule.modulestore.exceptions import ItemNotFoundError -from xmodule.modulestore.xml_importer import import_from_xml -from xmodule.timeparse import stringify_time -from xmodule.x_module import ModuleSystem -from xmodule_modifiers import replace_static_urls, wrap_xmodule import json import logging import os -import shutil import sys -import tarfile import time -from contentstore import course_info_model -from contentstore.utils import get_modulestore +import tarfile +import shutil +from datetime import datetime +from collections import defaultdict +from uuid import uuid4 +from path import path + +# to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz' +from PIL import Image + +from django.http import HttpResponse, Http404, HttpResponseBadRequest, HttpResponseForbidden +from django.contrib.auth.decorators import login_required +from django.core.exceptions import PermissionDenied +from django.core.context_processors import csrf +from django_future.csrf import ensure_csrf_cookie +from django.core.urlresolvers import reverse +from django.conf import settings + +from xmodule.modulestore import Location +from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError +from xmodule.x_module import ModuleSystem +from xmodule.error_module import ErrorDescriptor +from xmodule.errortracker import exc_info_to_str +from static_replace import replace_urls +from external_auth.views import ssl_login_shortcut + +from mitxmako.shortcuts import render_to_response, render_to_string +from xmodule.modulestore.django import modulestore +from xmodule_modifiers import replace_static_urls, wrap_xmodule +from xmodule.exceptions import NotFoundError +from functools import partial + +from xmodule.contentstore.django import contentstore +from xmodule.contentstore.content import StaticContent + +from auth.authz import is_user_in_course_group_role, get_users_in_course_group_by_role +from auth.authz import get_user_by_email, add_user_to_course_group, remove_user_from_course_group +from auth.authz import INSTRUCTOR_ROLE_NAME, STAFF_ROLE_NAME, create_all_course_groups +from .utils import get_course_location_for_item, get_lms_link_for_item, compute_unit_state, get_date_display, UnitState, get_course_for_item + +from xmodule.modulestore.xml_importer import import_from_xml +from contentstore.course_info_model import get_course_updates,\ + update_course_updates, delete_course_update +from cache_toolbox.core import del_cached_content +from xmodule.timeparse import stringify_time +from contentstore.module_info_model import get_module_info, set_module_info from cms.djangoapps.models.settings.course_details import CourseDetails,\ CourseSettingsEncoder from cms.djangoapps.models.settings.course_grading import CourseGradingModel +from cms.djangoapps.contentstore.utils import get_modulestore # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz' @@ -474,11 +480,20 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_ error_msg=exc_info_to_str(sys.exc_info()) ).xmodule_constructor(system)(None, None) - module.get_html = wrap_xmodule( - module.get_html, - module, - "xmodule_display.html", - ) + # cdodge: Special case + if module.location.category == 'static_tab': + module.get_html = wrap_xmodule( + module.get_html, + module, + "xmodule_tab_display.html", + ) + else: + module.get_html = wrap_xmodule( + module.get_html, + module, + "xmodule_display.html", + ) + module.get_html = replace_static_urls( module.get_html, module.metadata.get('data_dir', module.location.course), @@ -905,7 +920,8 @@ def course_info(request, org, course, name, provided_id=None): 'active_tab': 'courseinfo-tab', 'context_course': course_module, 'url_base' : "/" + org + "/" + course + "/", - 'course_updates' : json.dumps(course_info_model.get_course_updates(location)) + 'course_updates' : json.dumps(get_course_updates(location)), + 'handouts_location': Location(['i4x', org, course, 'course_info', 'handouts']).url() }) @expect_json @@ -928,13 +944,38 @@ def course_info_updates(request, org, course, provided_id=None): real_method = request.method if request.method == 'GET': - return HttpResponse(json.dumps(course_info_model.get_course_updates(location)), mimetype="application/json") + return HttpResponse(json.dumps(get_course_updates(location)), mimetype="application/json") elif real_method == 'POST': - return HttpResponse(json.dumps(course_info_model.update_course_updates(location, request.POST, provided_id)), mimetype="application/json") + # new instance (unless django makes PUT a POST): updates are coming as POST. Not sure why. + return HttpResponse(json.dumps(update_course_updates(location, request.POST, provided_id)), mimetype="application/json") elif real_method == 'PUT': - return HttpResponse(json.dumps(course_info_model.update_course_updates(location, request.POST, provided_id)), mimetype="application/json") - elif real_method == 'DELETE': - return HttpResponse(json.dumps(course_info_model.delete_course_update(location, request.POST, provided_id)), mimetype="application/json") + return HttpResponse(json.dumps(update_course_updates(location, request.POST, provided_id)), mimetype="application/json") + elif real_method == 'DELETE': # coming as POST need to pull from Request Header X-HTTP-Method-Override DELETE + return HttpResponse(json.dumps(delete_course_update(location, request.POST, provided_id)), mimetype="application/json") + + +@expect_json +@login_required +@ensure_csrf_cookie +def module_info(request, module_location): + location = Location(module_location) + + # NB: we're setting Backbone.emulateHTTP to true on the client so everything comes as a post!!! + if request.method == 'POST' and 'HTTP_X_HTTP_METHOD_OVERRIDE' in request.META: + real_method = request.META['HTTP_X_HTTP_METHOD_OVERRIDE'] + else: + real_method = request.method + + # check that logged in user has permissions to this item + if not has_access(request.user, location): + raise PermissionDenied() + + if real_method == 'GET': + return HttpResponse(json.dumps(get_module_info(get_modulestore(location), location)), mimetype="application/json") + elif real_method == 'POST' or real_method == 'PUT': + return HttpResponse(json.dumps(set_module_info(get_modulestore(location), location, request.POST)), mimetype="application/json") + else: + return HttpResponseBadRequest @login_required @ensure_csrf_cookie @@ -1079,7 +1120,10 @@ def create_new_course(request): number = request.POST.get('number') display_name = request.POST.get('display_name') - dest_location = Location('i4x', org, number, 'course', Location.clean(display_name)) + try: + dest_location = Location('i4x', org, number, 'course', Location.clean(display_name)) + except InvalidLocationError as e: + return HttpResponse(json.dumps({'ErrMsg': "Unable to create course '" + display_name + "'.\n\n" + e.message})) # see if the course already exists existing_course = None diff --git a/cms/envs/jasmine.py b/cms/envs/jasmine.py index b29e170411..5c9be1cf9c 100644 --- a/cms/envs/jasmine.py +++ b/cms/envs/jasmine.py @@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log", logging_env="dev", tracking_filename="tracking.log", dev_env=True, - debug=True) + debug=True, + local_loglevel='ERROR', + console_loglevel='ERROR') PIPELINE_JS['js-test-source'] = { 'source_filenames': sum([ diff --git a/cms/static/client_templates/course_info_handouts.html b/cms/static/client_templates/course_info_handouts.html new file mode 100644 index 0000000000..958a1c77d6 --- /dev/null +++ b/cms/static/client_templates/course_info_handouts.html @@ -0,0 +1,19 @@ +Edit + +

Course Handouts

+<%if (model.get('data') != null) { %> +
+ <%= model.get('data') %> +
+<% } else {%> +

You have no handouts defined

+<% } %> +
+
+ +
+
+ Save + Cancel +
+
diff --git a/cms/static/client_templates/course_info_update.html b/cms/static/client_templates/course_info_update.html new file mode 100644 index 0000000000..79775db5e3 --- /dev/null +++ b/cms/static/client_templates/course_info_update.html @@ -0,0 +1,29 @@ +
  • + +
    +
    + + + +
    +
    + +
    +
    + + Save + Cancel +
    +
    +
    +
    + Edit + Delete +
    +

    + <%= + updateModel.get('date') %> +

    +
    <%= updateModel.get('content') %>
    +
    +
    • \ No newline at end of file diff --git a/cms/static/client_templates/load_templates.html b/cms/static/client_templates/load_templates.html new file mode 100644 index 0000000000..3ff88d6fe5 --- /dev/null +++ b/cms/static/client_templates/load_templates.html @@ -0,0 +1,14 @@ + + +<%block name="jsextra"> + + + + \ No newline at end of file diff --git a/cms/static/img/delete-icon.png b/cms/static/img/delete-icon.png index 1855a2943d..9c7f65daef 100644 Binary files a/cms/static/img/delete-icon.png and b/cms/static/img/delete-icon.png differ diff --git a/cms/static/img/edit-icon.png b/cms/static/img/edit-icon.png index 2da9551010..748d3d2115 100644 Binary files a/cms/static/img/edit-icon.png and b/cms/static/img/edit-icon.png differ diff --git a/cms/static/img/plus-icon-white.png b/cms/static/img/plus-icon-white.png new file mode 100644 index 0000000000..d2c5263f93 Binary files /dev/null and b/cms/static/img/plus-icon-white.png differ diff --git a/cms/static/js/base.js b/cms/static/js/base.js index d221acb7f2..47835fda66 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -11,6 +11,11 @@ $(document).ready(function() { $body = $('body'); $modal = $('.history-modal'); $modalCover = $('
    '); + // cdodge: this looks funny, but on AWS instances, this base.js get's wrapped in a separate scope as part of Django static + // pipelining (note, this doesn't happen on local runtimes). So if we set it on window, when we can access it from other + // scopes (namely the course-info tab) + window.$modalCover = $modalCover; + $body.append($modalCover); $newComponentItem = $('.new-component-item'); $newComponentTypePicker = $('.new-component'); @@ -93,7 +98,7 @@ $(document).ready(function() { // section name editing $('.section-name').bind('click', editSectionName); $('.edit-section-name-cancel').bind('click', cancelEditSectionName); - $('.edit-section-name-save').bind('click', saveEditSectionName); + // $('.edit-section-name-save').bind('click', saveEditSectionName); // section date setting $('.set-publish-date').bind('click', setSectionScheduleDate); @@ -585,33 +590,44 @@ function hideToastMessage(e) { $(this).closest('.toast-notification').remove(); } -function addNewSection(e) { +function addNewSection(e, isTemplate) { e.preventDefault(); + var $newSection = $($('#new-section-template').html()); + var $cancelButton = $newSection.find('.new-section-name-cancel'); $('.new-courseware-section-button').after($newSection); $newSection.find('.new-section-name').focus().select(); - $newSection.find('.new-section-name-save').bind('click', saveNewSection); - $newSection.find('.new-section-name-cancel').bind('click', cancelNewSection); + $newSection.find('.section-name-form').bind('submit', saveNewSection); + $cancelButton.bind('click', cancelNewSection); + $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); +} + +function checkForCancel(e) { + if(e.which == 27) { + $body.unbind('keyup', checkForCancel); + e.data.$cancelButton.click(); + } } function saveNewSection(e) { e.preventDefault(); - parent = $(this).data('parent'); - template = $(this).data('template'); + var $saveButton = $(this).find('.new-section-name-save'); + var parent = $saveButton.data('parent'); + var template = $saveButton.data('template'); + var display_name = $(this).find('.new-section-name').val(); - display_name = $(this).prev('.new-section-name').val(); - - $.post('/clone_item', - {'parent_location' : parent, - 'template' : template, - 'display_name': display_name, - }, - function(data) { + $.post('/clone_item', { + 'parent_location' : parent, + 'template' : template, + 'display_name': display_name, + }, + function(data) { if (data.id != undefined) - location.reload(); - }); + location.reload(); + } + ); } function cancelNewSection(e) { @@ -619,44 +635,44 @@ function cancelNewSection(e) { $(this).parents('section.new-section').remove(); } - function addNewCourse(e) { e.preventDefault(); var $newCourse = $($('#new-course-template').html()); + var $cancelButton = $newCourse.find('.new-course-cancel'); $('.new-course-button').after($newCourse); $newCourse.find('.new-course-name').focus().select(); - $newCourse.find('.new-course-save').bind('click', saveNewCourse); - $newCourse.find('.new-course-cancel').bind('click', cancelNewCourse); + $newCourse.find('form').bind('submit', saveNewCourse); + $cancelButton.bind('click', cancelNewCourse); + $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); } function saveNewCourse(e) { e.preventDefault(); var $newCourse = $(this).closest('.new-course'); - - template = $(this).data('template'); - - org = $newCourse.find('.new-course-org').val(); - number = $newCourse.find('.new-course-number').val(); - display_name = $newCourse.find('.new-course-name').val(); + var template = $(this).find('.new-course-save').data('template'); + var org = $newCourse.find('.new-course-org').val(); + var number = $newCourse.find('.new-course-number').val(); + var display_name = $newCourse.find('.new-course-name').val(); if (org == '' || number == '' || display_name == ''){ alert('You must specify all fields in order to create a new course.'); return; } - $.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) + $.post('/create_new_course', { + 'template' : template, + 'org' : org, + 'number' : number, + 'display_name': display_name, + }, + function(data) { + if (data.id != undefined) { + window.location = '/' + data.id.replace(/.*:\/\//, ''); + } else if (data.ErrMsg != undefined) { alert(data.ErrMsg); - }); + } + }); } function cancelNewCourse(e) { @@ -672,35 +688,37 @@ function addNewSubsection(e) { $section.find('.new-subsection-name-input').focus().select(); var $saveButton = $newSubsection.find('.new-subsection-name-save'); - $saveButton.bind('click', saveNewSubsection); + var $cancelButton = $newSubsection.find('.new-subsection-name-cancel'); - parent = $(this).parents("section.branch").data("id"); + var parent = $(this).parents("section.branch").data("id"); $saveButton.data('parent', parent) $saveButton.data('template', $(this).data('template')); - $newSubsection.find('.new-subsection-name-cancel').bind('click', cancelNewSubsection); + $newSubsection.find('.new-subsection-form').bind('submit', saveNewSubsection); + $cancelButton.bind('click', cancelNewSubsection); + $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); } function saveNewSubsection(e) { e.preventDefault(); - parent = $(this).data('parent'); - template = $(this).data('template'); + var parent = $(this).find('.new-subsection-name-save').data('parent'); + var template = $(this).find('.new-subsection-name-save').data('template'); + var display_name = $(this).find('.new-subsection-name-input').val(); - display_name = $(this).prev('.subsection-name').find('.new-subsection-name-input').val() - - $.post('/clone_item', - {'parent_location' : parent, - 'template' : template, - 'display_name': display_name, - }, - function(data) { + $.post('/clone_item', { + 'parent_location' : parent, + 'template' : template, + 'display_name': display_name + }, + function(data) { if (data.id != undefined) { location.reload(); } - }); + } + ); } function cancelNewSubsection(e) { @@ -710,22 +728,30 @@ function cancelNewSubsection(e) { function editSectionName(e) { e.preventDefault(); - $(this).children('div.section-name-edit').show(); - $(this).children('span.section-name-span').hide(); + $(this).unbind('click', editSectionName); + $(this).children('.section-name-edit').show(); + $(this).find('.edit-section-name').focus(); + $(this).children('.section-name-span').hide(); + $(this).find('.section-name-edit').bind('submit', saveEditSectionName); + $(this).find('.edit-section-name-cancel').bind('click', cancelNewSection); + $body.bind('keyup', { $cancelButton: $(this).find('.edit-section-name-cancel') }, checkForCancel); } function cancelEditSectionName(e) { e.preventDefault(); $(this).parent().hide(); - $(this).parent().siblings('span.section-name-span').show(); + $(this).parent().siblings('.section-name-span').show(); + $(this).closest('.section-name').bind('click', editSectionName); e.stopPropagation(); } function saveEditSectionName(e) { e.preventDefault(); - id = $(this).closest("section.courseware-section").data("id"); - display_name = $.trim($(this).prev('.edit-section-name').val()); + $(this).closest('.section-name').unbind('click', editSectionName); + + var id = $(this).closest('.courseware-section').data('id'); + var display_name = $.trim($(this).find('.edit-section-name').val()); $(this).closest('.courseware-section .section-name').append($spinner); $spinner.show(); @@ -746,10 +772,10 @@ function saveEditSectionName(e) { }).success(function() { $spinner.delay(250).fadeOut(250); - $_this.parent().siblings('span.section-name-span').html(display_name); - $_this.parent().siblings('span.section-name-span').show(); - $_this.parent().hide(); - e.stopPropagation(); + $_this.closest('h3').find('.section-name-span').html(display_name).show(); + $_this.hide(); + $_this.closest('.section-name').bind('click', editSectionName); + e.stopPropagation(); }); } diff --git a/cms/static/js/models/course_info.js b/cms/static/js/models/course_info.js index b1d10c8d16..8cb5a654cb 100644 --- a/cms/static/js/models/course_info.js +++ b/cms/static/js/models/course_info.js @@ -15,7 +15,7 @@ CMS.Models.CourseInfo = Backbone.Model.extend({ // course update -- biggest kludge here is the lack of a real id to map updates to originals CMS.Models.CourseUpdate = Backbone.Model.extend({ defaults: { - "date" : $.datepicker.formatDate('MM d', new Date()), + "date" : $.datepicker.formatDate('MM d, yy', new Date()), "content" : "" } }); @@ -29,6 +29,8 @@ CMS.Models.CourseUpdateCollection = Backbone.Collection.extend({ model : CMS.Models.CourseUpdate }); + + \ No newline at end of file diff --git a/cms/static/js/models/module_info.js b/cms/static/js/models/module_info.js new file mode 100644 index 0000000000..6a593372c4 --- /dev/null +++ b/cms/static/js/models/module_info.js @@ -0,0 +1,10 @@ +CMS.Models.ModuleInfo = Backbone.Model.extend({ + url: function() {return "/module_info/" + this.id;}, + + defaults: { + "id": null, + "data": null, + "metadata" : null, + "children" : null + }, +}); \ No newline at end of file diff --git a/cms/static/js/template_loader.js b/cms/static/js/template_loader.js index b266575b7a..2e900814b0 100644 --- a/cms/static/js/template_loader.js +++ b/cms/static/js/template_loader.js @@ -5,7 +5,7 @@ if (typeof window.templateLoader == 'function') return; var templateLoader = { - templateVersion: "0.0.3", + templateVersion: "0.0.8", templates: {}, loadRemoteTemplate: function(templateName, filename, callback) { if (!this.templates[templateName]) { diff --git a/cms/static/js/views/course_info_edit.js b/cms/static/js/views/course_info_edit.js index 4f504d72e8..69ae933f5b 100644 --- a/cms/static/js/views/course_info_edit.js +++ b/cms/static/js/views/course_info_edit.js @@ -13,7 +13,11 @@ CMS.Views.CourseInfoEdit = Backbone.View.extend({ el: this.$('#course-update-view'), collection: this.model.get('updates') }); - // TODO instantiate the handouts view + + new CMS.Views.ClassInfoHandoutsView({ + el: this.$('#course-handouts-view'), + model: this.model.get('handouts') + }); return this; } }); @@ -34,11 +38,11 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ // instantiates an editor template for each update in the collection window.templateLoader.loadRemoteTemplate("course_info_update", // TODO Where should the template reside? how to use the static.url to create the path? - "/static/coffee/src/client_templates/course_info_update.html", - function (raw_template) { + "/static/client_templates/course_info_update.html", + function (raw_template) { self.template = _.template(raw_template); - self.render(); - } + self.render(); + } ); }, @@ -53,28 +57,47 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ $(updateEle).append(newEle); }); this.$el.find(".new-update-form").hide(); + this.$el.find('.date').datepicker({ 'dateFormat': 'MM d, yy' }); return this; }, onNew: function(event) { + var self = this; // create new obj, insert into collection, and render this one ele overriding the hidden attr var newModel = new CMS.Models.CourseUpdate(); this.collection.add(newModel, {at : 0}); - var newForm = this.template({ updateModel : newModel }); + var $newForm = $(this.template({ updateModel : newModel })); + + var $textArea = $newForm.find(".new-update-content").first(); + if (this.$codeMirror == null ) { + this.$codeMirror = CodeMirror.fromTextArea($textArea.get(0), { + mode: "text/html", + lineNumbers: true, + lineWrapping: true, + }); + } + var updateEle = this.$el.find("#course-update-list"); - $(updateEle).append(newForm); - $(newForm).find(".new-update-form").show(); + $(updateEle).prepend($newForm); + $newForm.addClass('editing'); + this.$currentPost = $newForm.closest('li'); + + window.$modalCover.show(); + window.$modalCover.bind('click', function() { + self.closeEditor(self, true); + }); + + $('.date').datepicker('destroy'); + $('.date').datepicker({ 'dateFormat': 'MM d, yy' }); }, onSave: function(event) { var targetModel = this.eventModel(event); - targetModel.set({ date : this.dateEntry(event).val(), content : this.contentEntry(event).val() }); - // push change to display, hide the editor, submit the change - $(this.dateDisplay(event)).val(targetModel.get('date')); - $(this.contentDisplay(event)).val(targetModel.get('content')); - $(this.editor(event)).hide(); - + console.log(this.contentEntry(event).val()); + targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() }); + // push change to display, hide the editor, submit the change + this.closeEditor(this); targetModel.save(); }, @@ -82,14 +105,31 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ // change editor contents back to model values and hide the editor $(this.editor(event)).hide(); var targetModel = this.eventModel(event); - $(this.dateEntry(event)).val(targetModel.get('date')); - $(this.contentEntry(event)).val(targetModel.get('content')); + this.closeEditor(this, !targetModel.id); }, onEdit: function(event) { + var self = this; + this.$currentPost = $(event.target).closest('li'); + this.$currentPost.addClass('editing'); + $(this.editor(event)).show(); + var $textArea = this.$currentPost.find(".new-update-content").first(); + if (this.$codeMirror == null ) { + this.$codeMirror = CodeMirror.fromTextArea($textArea.get(0), { + mode: "text/html", + lineNumbers: true, + lineWrapping: true, + }); + } + + window.$modalCover.show(); + var targetModel = this.eventModel(event); + window.$modalCover.bind('click', function() { + self.closeEditor(self); + }); }, - + onDelete: function(event) { // TODO ask for confirmation // remove the dom element and delete the model @@ -101,6 +141,24 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ } }); }, + + closeEditor: function(self, removePost) { + var targetModel = self.collection.getByCid(self.$currentPost.attr('name')); + + if(removePost) { + self.$currentPost.remove(); + } + + // close the modal and insert the appropriate data + self.$currentPost.removeClass('editing'); + self.$currentPost.find('.date-display').html(targetModel.get('date')); + self.$currentPost.find('.date').val(targetModel.get('date')); + self.$currentPost.find('.update-contents').html(targetModel.get('content')); + self.$currentPost.find('.new-update-content').val(targetModel.get('content')); + self.$currentPost.find('form').hide(); + window.$modalCover.unbind('click'); + window.$modalCover.hide(); + }, // Dereferencing from events to screen elements eventModel: function(event) { @@ -119,7 +177,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ dateEntry: function(event) { var li = $(event.currentTarget).closest("li"); - if (li) return $(li).find("#date-entry").first(); + if (li) return $(li).find(".date").first(); }, contentEntry: function(event) { @@ -135,4 +193,83 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ } }); - \ No newline at end of file + +// the handouts view is dumb right now; it needs tied to a model and all that jazz +CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({ + // collection is CourseUpdateCollection + events: { + "click .save-button" : "onSave", + "click .cancel-button" : "onCancel", + "click .edit-button" : "onEdit" + }, + + initialize: function() { + var self = this; + this.model.fetch( + { + complete: function() { + window.templateLoader.loadRemoteTemplate("course_info_handouts", + "/static/client_templates/course_info_handouts.html", + function (raw_template) { + self.template = _.template(raw_template); + self.render(); + } + ); + } + } + ); + }, + + render: function () { + var updateEle = this.$el; + var self = this; + this.$el.html( + $(this.template( { + model: this.model + }) + ) + ); + this.$preview = this.$el.find('.handouts-content'); + this.$form = this.$el.find(".edit-handouts-form"); + this.$editor = this.$form.find('.handouts-content-editor'); + this.$form.hide(); + + return this; + }, + + onEdit: function(event) { + var self = this; + this.$editor.val(this.$preview.html()); + this.$form.show(); + if (this.$codeMirror == null) { + this.$codeMirror = CodeMirror.fromTextArea(this.$editor.get(0), { + mode: "text/html", + lineNumbers: true, + lineWrapping: true, + }); + } + window.$modalCover.show(); + window.$modalCover.bind('click', function() { + self.closeEditor(self); + }); + }, + + onSave: function(event) { + this.model.set('data', this.$codeMirror.getValue()); + this.render(); + this.model.save(); + this.$form.hide(); + this.closeEditor(this); + }, + + onCancel: function(event) { + this.$form.hide(); + this.closeEditor(this); + }, + + closeEditor: function(self) { + this.$form.hide(); + window.$modalCover.unbind('click'); + window.$modalCover.hide(); + } +}); \ No newline at end of file diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index a91d703d0f..3957cb60d9 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -181,6 +181,11 @@ code { padding: 20px; } + .details { + margin-bottom: 30px; + font-size: 14px; + } + h4 { padding: 6px 14px; border-bottom: 1px solid #cbd1db; @@ -338,4 +343,29 @@ body.show-wip { content: ''; @extend .spinner-icon; } +} + +.new-button { + @include grey-button; + padding: 20px 0; + text-align: center; + + &.big { + display: block; + } +} + +.edit-button.standard, +.delete-button.standard { + float: left; + @include white-button; + padding: 3px 10px 4px; + margin-left: 7px; + font-size: 12px; + font-weight: 400; + + .edit-icon, + .delete-icon { + margin-right: 4px; + } } \ No newline at end of file diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index 2f43bfd208..3a8f24b5a9 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -51,14 +51,14 @@ @include button; border: 1px solid $darkGrey; border-radius: 3px; - @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0) 60%); + @include linear-gradient(top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0)); background-color: #dfe5eb; @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset); - color: #5d6779; + color: #778192; &:hover { background-color: #f2f6f9; - color: #5d6779; + color: #778192; } } diff --git a/cms/static/sass/_course-info.scss b/cms/static/sass/_course-info.scss index 6eb08943b1..2ec22ebfea 100644 --- a/cms/static/sass/_course-info.scss +++ b/cms/static/sass/_course-info.scss @@ -1,77 +1,179 @@ -body.updates { +.course-info { h2 { margin-bottom: 24px; font-size: 22px; font-weight: 300; } + + .course-info-wrapper { + display: table; + width: 100%; + clear: both; + } + + .main-column, + .course-handouts { + float: none; + display: table-cell; + } + + .main-column { + border-radius: 3px 0 0 3px; + border-right-color: $mediumGrey; + } + + .CodeMirror { + border: 1px solid #3c3c3c; + background: #fff; + color: #3c3c3c; + } } .course-updates { padding: 30px 40px; + margin: 0; - li { - padding: 24px 0 32px; + .update-list > li { + padding: 34px 0 42px; border-top: 1px solid #cbd1db; - } - h3 { - margin-bottom: 18px; - font-size: 14px; - font-weight: 700; - color: #646464; - letter-spacing: 1px; - text-transform: uppercase; + &.editing { + position: relative; + z-index: 1001; + padding: 0; + border-top: none; + border-radius: 3px; + background: #fff; + + .post-preview { + display: none; + } + } + + h1 { + float: none; + font-size: 24px; + font-weight: 300; + } + + h2 { + margin-bottom: 18px; + font-size: 14px; + font-weight: 700; + line-height: 30px; + color: #646464; + letter-spacing: 1px; + text-transform: uppercase; + } + + h3 { + margin: 34px 0 11px; + font-size: 16px; + font-weight: 700; + } } .update-contents { - padding-left: 30px; - p { - font-size: 14px; - line-height: 18px; + font-size: 16px; + line-height: 25px; } p + p { - margin-top: 18px; + margin-top: 25px; + } + + .primary { + border: 1px solid #ddd; + background: #f6f6f6; + padding: 20px; } } .new-update-button { - @include grey-button; + @include blue-button; display: block; text-align: center; - padding: 12px 0; + padding: 18px 0; margin-bottom: 28px; } .new-update-form { @include edit-box; margin-bottom: 24px; + padding: 30px; + border: none; textarea { height: 180px; } } + + .post-actions { + float: right; + + .edit-button, + .delete-button{ + float: left; + @include white-button; + padding: 3px 10px 4px; + margin-left: 7px; + font-size: 12px; + font-weight: 400; + + .edit-icon, + .delete-icon { + margin-right: 4px; + } + } + } } .course-handouts { - padding: 15px 20px; + width: 30%; + padding: 20px 30px; + margin: 0; + border-radius: 0 3px 3px 0; + border-left: none; + background: $lightGrey; - .new-handout-button { - @include grey-button; - display: block; - text-align: center; - padding: 12px 0; - margin-bottom: 28px; + h2 { + font-size: 18px; + font-weight: 700; } - li { - margin-bottom: 10px; + .edit-button { + float: right; + @include white-button; + padding: 3px 10px 4px; + margin-left: 7px; + font-size: 12px; + font-weight: 400; + + .edit-icon, + .delete-icon { + margin-right: 4px; + } + } + + .handouts-content { font-size: 14px; } - .new-handout-form { - @include edit-box; - margin-bottom: 24px; + .treeview-handoutsnav li { + margin-bottom: 12px; + } +} + +.edit-handouts-form { + @include edit-box; + position: absolute; + right: 0; + z-index: 10001; + width: 800px; + padding: 30px; + + textarea { + height: 300px; } } \ No newline at end of file diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss index 094b6183dd..23024f74e4 100644 --- a/cms/static/sass/_courseware.scss +++ b/cms/static/sass/_courseware.scss @@ -5,12 +5,7 @@ input.courseware-unit-search-input { } .courseware-overview { - .new-courseware-section-button { - @include grey-button; - display: block; - text-align: center; - padding: 12px 0; - } + } .courseware-section { @@ -146,18 +141,18 @@ input.courseware-unit-search-input { .section-name-edit { input { - font-size: 16px; + font-size: 16px; } .save-button { @include blue-button; - padding: 7px 20px 7px; + padding: 10px 20px; margin-right: 5px; } .cancel-button { @include white-button; - padding: 7px 20px 7px; + padding: 10px 20px; } } @@ -205,7 +200,7 @@ input.courseware-unit-search-input { .new-section-name-save, .new-subsection-name-save { @include blue-button; - padding: 2px 20px 5px; + padding: 6px 20px 8px; margin: 0 5px; color: #fff !important; } @@ -213,7 +208,7 @@ input.courseware-unit-search-input { .new-section-name-cancel, .new-subsection-name-cancel { @include white-button; - padding: 2px 20px 5px; + padding: 6px 20px 8px; color: #8891a1 !important; } diff --git a/cms/static/sass/_dashboard.scss b/cms/static/sass/_dashboard.scss index 8763927bdb..8821f3736c 100644 --- a/cms/static/sass/_dashboard.scss +++ b/cms/static/sass/_dashboard.scss @@ -89,6 +89,7 @@ .new-course-save { @include blue-button; + // padding: ; } .new-course-cancel { diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index c6d775ed12..4a63a8a885 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -137,6 +137,10 @@ height: 11px; margin-right: 8px; background: url(../img/plus-icon.png) no-repeat; + + &.white { + background: url(../img/plus-icon-white.png) no-repeat; + } } .plus-icon-small { diff --git a/cms/static/sass/_lms.scss b/cms/static/sass/_lms.scss new file mode 100644 index 0000000000..1ddc48edaf --- /dev/null +++ b/cms/static/sass/_lms.scss @@ -0,0 +1,69 @@ +.component { + font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 1.6; + color: #3c3c3c; + + a { + color: #1d9dd9; + text-decoration: none; + } + + p { + font-size: 16px; + line-height: 1.6; + } + + h1 { + float: none; + } + + h2 { + color: #646464; + font-size: 19px; + font-weight: 300; + letter-spacing: 1px; + margin-bottom: 15px; + margin-left: 0; + text-transform: uppercase; + } + + h3 { + font-size: 19px; + font-weight: 400; + } + + h4 { + background: none; + padding: 0; + border: none; + @include box-shadow(none); + font-size: 16px; + font-weight: 400; + } + + code { + margin: 0 2px; + padding: 0px 5px; + border-radius: 3px; + border: 1px solid #eaeaea; + white-space: nowrap; + font-family: Monaco, monospace; + font-size: 14px; + background-color: #f8f8f8; + } + + p + h2, ul + h2, ol + h2, p + h3 { + margin-top: 40px; + } + + p + p, ul + p, ol + p { + margin-top: 20px; + } + + p { + color: #3c3c3c; + font: normal 1em/1.6em; + margin: 0px; + } +} \ No newline at end of file diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss index 628d537f90..c8ffa0316c 100644 --- a/cms/static/sass/_static-pages.scss +++ b/cms/static/sass/_static-pages.scss @@ -6,6 +6,72 @@ padding: 12px 0; } + .unit-body { + padding: 30px 40px; + } + + .components > li { + margin: 0; + border-radius: 0; + + &.new-component-item { + margin-top: 20px; + } + } + + .component { + border: 1px solid $mediumGrey; + border-top: none; + + &:first-child { + border-top: 1px solid $mediumGrey; + } + + &:hover { + border: 1px solid $mediumGrey; + border-top: none; + + &:first-child { + border-top: 1px solid $mediumGrey; + } + + .drag-handle { + background: url(../img/drag-handles.png) center no-repeat $lightGrey; + } + } + + .drag-handle { + top: 0; + right: 0; + z-index: 11; + width: 35px; + border: none; + background: url(../img/drag-handles.png) center no-repeat $lightGrey; + + &:hover { + background: url(../img/drag-handles.png) center no-repeat $lightGrey; + } + } + + .component-actions { + top: 26px; + right: 44px; + } + } + + .component.editing { + .xmodule_display { + display: none; + } + } + + .xmodule_display { + padding: 20px 20px 22px; + font-size: 24px; + font-weight: 300; + background: $lightGrey; + } + .static-page-item { position: relative; margin: 10px 0; diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 220bec507d..fdf737fc12 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -4,6 +4,7 @@ } .main-column { + clear: both; float: left; width: 70%; } @@ -54,94 +55,11 @@ position: relative; z-index: 10; margin: 20px 40px; - border: 1px solid #d1ddec; - border-radius: 3px; - background: #fff; - @include transition(none); - - &:hover { - border-color: #6696d7; - - .drag-handle, - .component-actions a { - background-color: $blue; - } - - .drag-handle { - border-color: $blue; - } - } - - &.editing { - border-color: #6696d7; - - .drag-handle, - .component-actions { - display: none; - } - } - - &.component-placeholder { - border-color: #6696d7; - } - - .xmodule_display { - padding: 40px 20px 20px; - } - - .component-actions { - position: absolute; - top: 4px; - right: 4px; - @include transition(opacity .15s); - } - - .edit-button, - .delete-button { - float: left; - padding: 3px 10px 4px; - margin-left: 3px; - border: 1px solid #fff; - border-radius: 3px; - background: #d1ddec; - font-size: 12px; - color: #fff; - @include transition(all .15s); - - &:hover { - background-color: $blue; - color: #fff; - } - - .edit-icon, - .delete-icon { - margin-right: 4px; - } - } - - .drag-handle { - position: absolute; - display: block; - top: -1px; - right: -16px; - z-index: -1; - width: 15px; - height: 100%; - border-radius: 0 3px 3px 0; - border: 1px solid #d1ddec; - background: url(../img/white-drag-handles.png) center no-repeat #d1ddec; - cursor: move; - @include transition(all .15s); - } &.new-component-item { padding: 0; - border: 1px solid #8891a1; - border-radius: 3px; - @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); - background-color: #d1dae3; - @include box-shadow(0 1px 0 rgba(255, 255, 255, .2) inset); - @include transition(background-color .15s, border-color .15s); + border: none; + border-radius: 0; &.adding { background-color: $blue; @@ -223,8 +141,63 @@ } } + .component { + border: 1px solid #d1ddec; + border-radius: 3px; + background: #fff; + @include transition(none); + + &:hover { + border-color: #6696d7; + + .drag-handle { + background-color: $blue; + border-color: $blue; + } + } + + &.editing { + border-color: #6696d7; + + .drag-handle, + .component-actions { + display: none; + } + } + + &.component-placeholder { + border-color: #6696d7; + } + + .component-actions { + position: absolute; + top: 7px; + right: 9px; + @include transition(opacity .15s); + + a { + color: $darkGrey; + } + } + + .drag-handle { + position: absolute; + display: block; + top: -1px; + right: -16px; + z-index: -1; + width: 15px; + height: 100%; + border-radius: 0 3px 3px 0; + border: 1px solid #d1ddec; + background: url(../img/white-drag-handles.png) center no-repeat #d1ddec; + cursor: move; + @include transition(all .15s); + } + } + .xmodule_display { - padding: 10px 20px; + padding: 40px 20px 20px; } .component-editor { diff --git a/cms/static/sass/_users.scss b/cms/static/sass/_users.scss index 7c60ee5c3b..bca9b4f2fb 100644 --- a/cms/static/sass/_users.scss +++ b/cms/static/sass/_users.scss @@ -2,11 +2,6 @@ .user-overview { @extend .window; padding: 30px 40px; - - .details { - margin-bottom: 20px; - font-size: 14px; - } } .new-user-button { diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 73812125a8..e8dbde3c12 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -25,6 +25,7 @@ @import "modal"; @import "alerts"; @import "login"; +@import "lms"; @import 'jquery-ui-calendar'; @import 'content-types'; diff --git a/cms/templates/base.html b/cms/templates/base.html index 33fe02aadd..9861f2a3de 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -9,9 +9,6 @@ <%static:css group='base-style'/> - - - <%block name="title"></%block> @@ -36,9 +33,8 @@ - - - + + + + + + + @@ -33,16 +43,18 @@

    Course Info

    -
    -
    -

    Updates

    - New Update -
      - +
      +
      +
      -
      -
      -
      -
      + +
      +
      +
      \ No newline at end of file diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 94c5e38260..41dee15a7a 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -20,23 +20,24 @@

      Static Tabs

      -
      -
      -
      -
        - % for id in components: -
      1. - % endfor - -
      2. - - New Tab - -
        3. -
      -
      -
      -
      +
      +
      +

      Here you can add and manage additional pages for your course. These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.

      +
      +
      +
        + % for id in components: +
      1. + % endfor + +
      2. + + New Tab + +
        3. +
      +
      +
      \ No newline at end of file diff --git a/cms/templates/index.html b/cms/templates/index.html index 652acfa0ea..d41bcc23ac 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -22,14 +22,14 @@
      - Save - Cancel + +
      - + <%block name="content">
      diff --git a/cms/templates/overview.html b/cms/templates/overview.html index cc0d7e8e32..a75a27745f 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -12,10 +12,10 @@ <%namespace name="units" file="widgets/units.html" /> <%block name="jsextra"> - - - - + + + + <%block name="header_extras"> @@ -24,7 +24,33 @@
      -

      SaveCancel

      +

      +
      + + +

      + +
      +
      + + + + + + + + + + + + + + + + + <% for src in js_source %> + + <% end %> + + + <% for src in js_specs %> + + <% end %> + + + + + + + + diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index ea17c23bb4..9922b1b8a0 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -347,7 +347,7 @@ class CapaModule(XModule): id=self.location.html_id(), ajax_url=self.system.ajax_url) + html + "
      " # now do the substitutions which are filesystem based, e.g. '/static/' prefixes - return self.system.replace_urls(html, self.metadata['data_dir']) + return self.system.replace_urls(html, self.metadata['data_dir'], course_namespace=self.location) def handle_ajax(self, dispatch, get): ''' @@ -451,7 +451,7 @@ class CapaModule(XModule): new_answers = dict() for answer_id in answers: try: - new_answer = {answer_id: self.system.replace_urls(answers[answer_id], self.metadata['data_dir'])} + new_answer = {answer_id: self.system.replace_urls(answers[answer_id], self.metadata['data_dir'], course_namespace=self.location)} except TypeError: log.debug('Unable to perform URL substitution on answers[%s]: %s' % (answer_id, answers[answer_id])) new_answer = {answer_id: answers[answer_id]} diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py index a7a76fa242..9badd4b892 100644 --- a/common/lib/xmodule/xmodule/contentstore/content.py +++ b/common/lib/xmodule/xmodule/contentstore/content.py @@ -46,6 +46,11 @@ class StaticContent(object): else: return None + @staticmethod + def get_base_url_path_for_course_assets(loc): + if loc is not None: + return "/c4x/{org}/{course}/asset".format(**loc.dict()) + @staticmethod def get_id_from_location(location): return { 'tag':location.tag, 'org' : location.org, 'course' : location.course, diff --git a/common/lib/xmodule/xmodule/graders.py b/common/lib/xmodule/xmodule/graders.py index cdf62fdffc..e3b123ce15 100644 --- a/common/lib/xmodule/xmodule/graders.py +++ b/common/lib/xmodule/xmodule/graders.py @@ -1,6 +1,5 @@ import abc import inspect -import json import logging import random import sys @@ -66,17 +65,27 @@ def grader_from_conf(conf): for subgraderconf in conf: subgraderconf = subgraderconf.copy() weight = subgraderconf.pop("weight", 0) + # NOTE: 'name' used to exist in SingleSectionGrader. We are deprecating SingleSectionGrader + # and converting everything into an AssignmentFormatGrader by adding 'min_count' and + # 'drop_count'. AssignmentFormatGrader does not expect 'name', so if it appears + # in bad_args, go ahead remove it (this causes no errors). Eventually, SingleSectionGrader + # should be completely removed. + name = 'name' try: if 'min_count' in subgraderconf: #This is an AssignmentFormatGrader subgrader_class = AssignmentFormatGrader - elif 'name' in subgraderconf: + elif name in subgraderconf: #This is an SingleSectionGrader subgrader_class = SingleSectionGrader else: raise ValueError("Configuration has no appropriate grader class.") bad_args = invalid_args(subgrader_class.__init__, subgraderconf) + # See note above concerning 'name'. + if bad_args.issuperset({name}): + bad_args = bad_args - {name} + del subgraderconf[name] if len(bad_args) > 0: log.warning("Invalid arguments for a subgrader: %s", bad_args) for key in bad_args: diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem.html b/common/lib/xmodule/xmodule/js/fixtures/problem.html index f77ece7845..525b4323b7 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/problem.html +++ b/common/lib/xmodule/xmodule/js/fixtures/problem.html @@ -1 +1,7 @@ -
      +
      +
      +
      +
      \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee index 107930c3b1..120a0fad33 100644 --- a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee @@ -8,25 +8,43 @@ describe 'Problem', -> MathJax.Hub.getAllJax.andReturn [@stubbedJax] window.update_schematics = -> + # Load this function from spec/helper.coffee + # Note that if your test fails with a message like: + # 'External request attempted for blah, which is not defined.' + # this msg is coming from the stubRequests function else clause. + jasmine.stubRequests() + + # note that the fixturesPath is set in spec/helper.coffee loadFixtures 'problem.html' + spyOn Logger, 'log' spyOn($.fn, 'load').andCallFake (url, callback) -> $(@).html readFixtures('problem_content.html') callback() - jasmine.stubRequests() describe 'constructor', -> - beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" - it 'set the element', -> - expect(@problem.el).toBe '#problem_1' + it 'set the element from html', -> + @problem999 = new Problem (" +
      +
      +
      +
      + ") + expect(@problem999.element_id).toBe 'problem_999' + + it 'set the element from loadFixtures', -> + @problem1 = new Problem($('.xmodule_display')) + expect(@problem1.element_id).toBe 'problem_1' describe 'bind', -> beforeEach -> spyOn window, 'update_schematics' MathJax.Hub.getAllJax.andReturn [@stubbedJax] - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) it 'set mathjax typeset', -> expect(MathJax.Hub.Queue).toHaveBeenCalled() @@ -38,7 +56,7 @@ describe 'Problem', -> expect($('section.action input:button')).toHandleWith 'click', @problem.refreshAnswers it 'bind the check button', -> - expect($('section.action input.check')).toHandleWith 'click', @problem.check + expect($('section.action input.check')).toHandleWith 'click', @problem.check_fd it 'bind the reset button', -> expect($('section.action input.reset')).toHandleWith 'click', @problem.reset @@ -60,7 +78,7 @@ describe 'Problem', -> describe 'render', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @bind = @problem.bind spyOn @problem, 'bind' @@ -86,9 +104,13 @@ describe 'Problem', -> it 're-bind the content', -> expect(@problem.bind).toHaveBeenCalled() + describe 'check_fd', -> + xit 'should have specs written for this functionality', -> + expect(false) + describe 'check', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @problem.answers = 'foo=1&bar=2' it 'log the problem_check event', -> @@ -98,30 +120,34 @@ describe 'Problem', -> it 'submit the answer for check', -> spyOn $, 'postWithPrefix' @problem.check() - expect($.postWithPrefix).toHaveBeenCalledWith '/modx/1/problem_check', 'foo=1&bar=2', jasmine.any(Function) + expect($.postWithPrefix).toHaveBeenCalledWith '/problem/Problem1/problem_check', + 'foo=1&bar=2', jasmine.any(Function) describe 'when the response is correct', -> it 'call render with returned content', -> - spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback(success: 'correct', contents: 'Correct!') + spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> + callback(success: 'correct', contents: 'Correct!') @problem.check() expect(@problem.el.html()).toEqual 'Correct!' describe 'when the response is incorrect', -> it 'call render with returned content', -> - spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback(success: 'incorrect', contents: 'Correct!') + spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> + callback(success: 'incorrect', contents: 'Incorrect!') @problem.check() - expect(@problem.el.html()).toEqual 'Correct!' + expect(@problem.el.html()).toEqual 'Incorrect!' describe 'when the response is undetermined', -> it 'alert the response', -> spyOn window, 'alert' - spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback(success: 'Number Only!') + spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> + callback(success: 'Number Only!') @problem.check() expect(window.alert).toHaveBeenCalledWith 'Number Only!' describe 'reset', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) it 'log the problem_reset event', -> @problem.answers = 'foo=1&bar=2' @@ -131,7 +157,8 @@ describe 'Problem', -> it 'POST to the problem reset page', -> spyOn $, 'postWithPrefix' @problem.reset() - expect($.postWithPrefix).toHaveBeenCalledWith '/modx/1/problem_reset', { id: 1 }, jasmine.any(Function) + expect($.postWithPrefix).toHaveBeenCalledWith '/problem/Problem1/problem_reset', + { id: 'i4x://edX/101/problem/Problem1' }, jasmine.any(Function) it 'render the returned content', -> spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> @@ -141,7 +168,7 @@ describe 'Problem', -> describe 'show', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @problem.el.prepend '
      ' describe 'when the answer has not yet shown', -> @@ -150,12 +177,14 @@ describe 'Problem', -> it 'log the problem_show event', -> @problem.show() - expect(Logger.log).toHaveBeenCalledWith 'problem_show', problem: 1 + expect(Logger.log).toHaveBeenCalledWith 'problem_show', + problem: 'i4x://edX/101/problem/Problem1' it 'fetch the answers', -> spyOn $, 'postWithPrefix' @problem.show() - expect($.postWithPrefix).toHaveBeenCalledWith '/modx/1/problem_show', jasmine.any(Function) + expect($.postWithPrefix).toHaveBeenCalledWith '/problem/Problem1/problem_show', + jasmine.any(Function) it 'show the answers', -> spyOn($, 'postWithPrefix').andCallFake (url, callback) -> @@ -220,7 +249,7 @@ describe 'Problem', -> describe 'save', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @problem.answers = 'foo=1&bar=2' it 'log the problem_save event', -> @@ -230,7 +259,8 @@ describe 'Problem', -> it 'POST to save problem', -> spyOn $, 'postWithPrefix' @problem.save() - expect($.postWithPrefix).toHaveBeenCalledWith '/modx/1/problem_save', 'foo=1&bar=2', jasmine.any(Function) + expect($.postWithPrefix).toHaveBeenCalledWith '/problem/Problem1/problem_save', + 'foo=1&bar=2', jasmine.any(Function) it 'alert to the user', -> spyOn window, 'alert' @@ -240,7 +270,7 @@ describe 'Problem', -> describe 'refreshMath', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) $('#input_example_1').val 'E=mc^2' @problem.refreshMath target: $('#input_example_1').get(0) @@ -250,7 +280,7 @@ describe 'Problem', -> describe 'updateMathML', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @stubbedJax.root.toMathML.andReturn '' describe 'when there is no exception', -> @@ -270,7 +300,7 @@ describe 'Problem', -> describe 'refreshAnswers', -> beforeEach -> - @problem = new Problem 1, "problem_1", "/problem/url/" + @problem = new Problem($('.xmodule_display')) @problem.el.html '''