Consider a hypothetical magnetic field pointing out of your computer screen. Now imagine an electron traveling from right to left in the plane of your screen. A diagram of this situation is show below…
+
+
+
a. The magnitude of the force experienced by the electron is proportional the product of which of the following? (Select all that apply.)
+
+
+
+
+Magnetic field strength…
+Electric field strength…
+Electric charge of the electron…
+Radius of the electron…
+Mass of the electron…
+Velocity of the electron…
+
+
+
+
+
diff --git a/common/test/data/full/policies/6.002_Spring_2012.json b/common/test/data/full/policies/6.002_Spring_2012.json
index 345309ff5c..2f55528b7b 100644
--- a/common/test/data/full/policies/6.002_Spring_2012.json
+++ b/common/test/data/full/policies/6.002_Spring_2012.json
@@ -8,6 +8,7 @@
{"type": "courseware"},
{"type": "course_info", "name": "Course Info"},
{"type": "static_tab", "url_slug": "syllabus", "name": "Syllabus"},
+ {"type": "static_tab", "url_slug": "resources", "name": "Resources"},
{"type": "discussion", "name": "Discussion"},
{"type": "wiki", "name": "Wiki"},
{"type": "progress", "name": "Progress"}
diff --git a/common/test/data/full/tabs/resources.html b/common/test/data/full/tabs/resources.html
new file mode 100644
index 0000000000..bf78c92fb1
--- /dev/null
+++ b/common/test/data/full/tabs/resources.html
@@ -0,0 +1 @@
+
This is another sample tab
\ No newline at end of file
diff --git a/doc/xml-format.md b/doc/xml-format.md
index f4fd1054cb..b93f3bbeab 100644
--- a/doc/xml-format.md
+++ b/doc/xml-format.md
@@ -141,6 +141,7 @@ That's basically all there is to the organizational structure. Read the next se
* `abtest` -- Support for A/B testing. TODO: add details..
* `chapter` -- top level organization unit of a course. The courseware display code currently expects the top level `course` element to contain only chapters, though there is no philosophical reason why this is required, so we may change it to properly display non-chapters at the top level.
+* `conditional` -- conditional element, which shows one or more modules only if certain conditions are satisfied.
* `course` -- top level tag. Contains everything else.
* `customtag` -- render an html template, filling in some parameters, and return the resulting html. See below for details.
* `discussion` -- Inline discussion forum
@@ -163,6 +164,22 @@ Container tags include `chapter`, `sequential`, `videosequence`, `vertical`, and
`course` is also a container, and is similar, with one extra wrinkle: the top level pointer tag _must_ have `org` and `course` attributes specified--the organization name, and course name. Note that `course` is referring to the platonic ideal of this course (e.g. "6.002x"), not to any particular run of this course. The `url_name` should be the particular run of this course.
+### `conditional`
+
+`conditional` is as special kind of container tag as well. Here are two examples:
+
+
+
+
+
+
+
+
+
+The condition can be either `require_completed`, in which case the required modules must be completed, or `require_attempted`, in which case the required modules must have been attempted.
+
+The required modules are specified as a set of `tag`/`url_name`, joined by an ampersand.
+
### `customtag`
When we see ``, we will:
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 21ef8b3d66..bd01318f63 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -113,6 +113,9 @@ class StudentModuleCache(object):
descriptor_filter=lambda descriptor: True,
select_for_update=False):
"""
+ obtain and return cache for descriptor descendents (ie children) AND modules required by the descriptor,
+ but which are not children of the module
+
course_id: the course in the context of which we want StudentModules.
user: the django user for whom to load modules.
descriptor: An XModuleDescriptor
@@ -132,7 +135,7 @@ class StudentModuleCache(object):
if depth is None or depth > 0:
new_depth = depth - 1 if depth is not None else depth
- for child in descriptor.get_children():
+ for child in descriptor.get_children() + descriptor.get_required_module_descriptors():
descriptors.extend(get_child_descriptors(child, new_depth, descriptor_filter))
return descriptors
diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 62ebeae9d7..0a7c723cb5 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -21,6 +21,16 @@ from fs.errors import ResourceNotFoundError
from courseware.access import has_access
from static_replace import replace_urls
+from lxml.html import rewrite_links
+from module_render import get_module
+from courseware.access import has_access
+from static_replace import replace_urls
+from xmodule.modulestore import Location
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.xml import XMLModuleStore
+from xmodule.x_module import XModule
+from student.models import unique_id_for_user
+
from open_ended_grading import open_ended_notifications
log = logging.getLogger(__name__)
diff --git a/lms/djangoapps/courseware/tests/factories.py b/lms/djangoapps/courseware/tests/factories.py
new file mode 100644
index 0000000000..6950e28565
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/factories.py
@@ -0,0 +1,44 @@
+import factory
+from student.models import (User, UserProfile, Registration,
+ CourseEnrollmentAllowed)
+from django.contrib.auth.models import Group
+from datetime import datetime
+import uuid
+
+class UserProfileFactory(factory.Factory):
+ FACTORY_FOR = UserProfile
+
+ user = None
+ name = 'Robot Studio'
+ courseware = 'course.xml'
+
+class RegistrationFactory(factory.Factory):
+ FACTORY_FOR = Registration
+
+ user = None
+ activation_key = uuid.uuid4().hex
+
+class UserFactory(factory.Factory):
+ FACTORY_FOR = User
+
+ username = 'robot'
+ email = 'robot@edx.org'
+ password = 'test'
+ first_name = 'Robot'
+ last_name = 'Tester'
+ is_staff = False
+ is_active = True
+ is_superuser = False
+ last_login = datetime.now()
+ date_joined = datetime.now()
+
+class GroupFactory(factory.Factory):
+ FACTORY_FOR = Group
+
+ name = 'test_group'
+
+class CourseEnrollmentAllowedFactory(factory.Factory):
+ FACTORY_FOR = CourseEnrollmentAllowed
+
+ email = 'test@edx.org'
+ course_id = 'edX/test/2012_Fall'
diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py
new file mode 100644
index 0000000000..ed9335d382
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/test_access.py
@@ -0,0 +1,109 @@
+import unittest
+import time
+from mock import Mock
+from django.test import TestCase
+
+from xmodule.modulestore import Location
+from factories import CourseEnrollmentAllowedFactory
+import courseware.access as access
+
+class AccessTestCase(TestCase):
+ def test__has_global_staff_access(self):
+ u = Mock(is_staff=False)
+ self.assertFalse(access._has_global_staff_access(u))
+
+ u = Mock(is_staff=True)
+ self.assertTrue(access._has_global_staff_access(u))
+
+ def test__has_access_to_location(self):
+ location = Location('i4x://edX/toy/course/2012_Fall')
+
+ self.assertFalse(access._has_access_to_location(None, location,
+ 'staff', None))
+ u = Mock()
+ u.is_authenticated.return_value = False
+ self.assertFalse(access._has_access_to_location(u, location,
+ 'staff', None))
+ u = Mock(is_staff=True)
+ self.assertTrue(access._has_access_to_location(u, location,
+ 'instructor', None))
+ # A user has staff access if they are in the staff group
+ u = Mock(is_staff=False)
+ g = Mock()
+ g.name = 'staff_edX/toy/2012_Fall'
+ u.groups.all.return_value = [g]
+ self.assertTrue(access._has_access_to_location(u, location,
+ 'staff', None))
+ # A user has staff access if they are in the instructor group
+ g.name = 'instructor_edX/toy/2012_Fall'
+ self.assertTrue(access._has_access_to_location(u, location,
+ 'staff', None))
+
+ # A user has instructor access if they are in the instructor group
+ g.name = 'instructor_edX/toy/2012_Fall'
+ self.assertTrue(access._has_access_to_location(u, location,
+ 'instructor', None))
+
+ # A user does not have staff access if they are
+ # not in either the staff or the the instructor group
+ g.name = 'student_only'
+ self.assertFalse(access._has_access_to_location(u, location,
+ 'staff', None))
+
+ # A user does not have instructor access if they are
+ # not in the instructor group
+ g.name = 'student_only'
+ self.assertFalse(access._has_access_to_location(u, location,
+ 'instructor', None))
+
+ def test__has_access_string(self):
+ u = Mock(is_staff=True)
+ self.assertFalse(access._has_access_string(u, 'not_global', 'staff', None))
+
+ u._has_global_staff_access.return_value = True
+ self.assertTrue(access._has_access_string(u, 'global', 'staff', None))
+
+ self.assertRaises(ValueError, access._has_access_string, u, 'global', 'not_staff', None)
+
+ def test__has_access_descriptor(self):
+ # TODO: override DISABLE_START_DATES and test the start date branch of the method
+ u = Mock()
+ d = Mock()
+ d.start = time.gmtime(time.time() - 86400) # make sure the start time is in the past
+
+ # Always returns true because DISABLE_START_DATES is set in test.py
+ self.assertTrue(access._has_access_descriptor(u, d, 'load'))
+ self.assertRaises(ValueError, access._has_access_descriptor, u, d, 'not_load_or_staff')
+
+ def test__has_access_course_desc_can_enroll(self):
+ u = Mock()
+ yesterday = time.gmtime(time.time() - 86400)
+ tomorrow = time.gmtime(time.time() + 86400)
+ c = Mock(enrollment_start=yesterday, enrollment_end=tomorrow)
+ c.metadata.get = 'is_public'
+
+ # User can enroll if it is between the start and end dates
+ self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+ # User can enroll if authenticated and specifically allowed for that course
+ # even outside the open enrollment period
+ u = Mock(email='test@edx.org', is_staff=False)
+ u.is_authenticated.return_value = True
+
+ c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/2012_Fall')
+ c.metadata.get = 'is_public'
+
+ allowed = CourseEnrollmentAllowedFactory(email=u.email, course_id=c.id)
+
+ self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+ # Staff can always enroll even outside the open enrollment period
+ u = Mock(email='test@edx.org', is_staff=True)
+ u.is_authenticated.return_value = True
+
+ c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/Whenever')
+ c.metadata.get = 'is_public'
+ self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
+
+ # TODO:
+ # Non-staff cannot enroll outside the open enrollment period if not specifically allowed
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index bf8a65126d..6c41cbac14 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -64,6 +64,21 @@ def mongo_store_config(data_dir):
}
}
+def draft_mongo_store_config(data_dir):
+ return {
+ 'default': {
+ 'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
+ 'OPTIONS': {
+ 'default_class': 'xmodule.raw_module.RawDescriptor',
+ 'host': 'localhost',
+ 'db': 'test_xmodule',
+ 'collection': 'modulestore',
+ 'fs_root': data_dir,
+ 'render_template': 'mitxmako.shortcuts.render_to_string',
+ }
+ }
+}
+
def xml_store_config(data_dir):
return {
'default': {
@@ -78,6 +93,7 @@ def xml_store_config(data_dir):
TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
TEST_DATA_MONGO_MODULESTORE = mongo_store_config(TEST_DATA_DIR)
+TEST_DATA_DRAFT_MONGO_MODULESTORE = draft_mongo_store_config(TEST_DATA_DIR)
class ActivateLoginTestCase(TestCase):
'''Check that we can activate and log in'''
@@ -423,6 +439,16 @@ class TestNavigation(PageLoader):
kwargs={'course_id': self.toy.id, 'chapter': 'secret:magic'}))
+@override_settings(MODULESTORE=TEST_DATA_DRAFT_MONGO_MODULESTORE)
+class TestDraftModuleStore(TestCase):
+ def test_get_items_with_course_items(self):
+ store = modulestore()
+ # fix was to allow get_items() to take the course_id parameter
+ store.get_items(Location(None, None, 'vertical', None, None), course_id='abc', depth=0)
+ # test success is just getting through the above statement. The bug was that 'course_id' argument was
+ # not allowed to be passed in (i.e. was throwing exception)
+
+
@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
class TestViewAuth(PageLoader):
"""Check that view authentication works properly"""
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 760ccb1d05..5d65d7c632 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -233,10 +233,13 @@ def index(request, course_id, chapter=None, section=None,
# Specifically asked-for section doesn't exist
raise Http404
- # Load all descendents of the section, because we're going to display it's
+ # Load all descendants of the section, because we're going to display its
# html, which in general will need all of its children
+ section_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+ course.id, request.user, section_descriptor, depth=None)
+
section_module = get_module(request.user, request, section_descriptor.location,
- student_module_cache, course.id, position=position, depth=None)
+ section_module_cache, course.id, position=position, depth=None)
if section_module is None:
# User may be trying to be clever and access something
# they don't have access to.
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index 059a8939a2..131fe5ad9f 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -6,6 +6,7 @@ django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/open
from django.test import TestCase
from open_ended_grading import staff_grading_service
+from open_ended_grading import peer_grading_service
from django.core.urlresolvers import reverse
from django.contrib.auth.models import Group
@@ -17,9 +18,10 @@ from nose import SkipTest
from mock import patch, Mock
import json
+import logging
+log = logging.getLogger(__name__)
from override_settings import override_settings
-_mock_service = staff_grading_service.MockStaffGradingService()
@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
class TestStaffGradingService(ct.PageLoader):
@@ -111,3 +113,145 @@ class TestStaffGradingService(ct.PageLoader):
d = json.loads(r.content)
self.assertTrue(d['success'], str(d))
self.assertIsNotNone(d['problem_list'])
+
+
+@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
+class TestPeerGradingService(ct.PageLoader):
+ '''
+ Check that staff grading service proxy works. Basically just checking the
+ access control and error handling logic -- all the actual work is on the
+ backend.
+ '''
+ def setUp(self):
+ xmodule.modulestore.django._MODULESTORES = {}
+
+ self.student = 'view@test.com'
+ self.instructor = 'view2@test.com'
+ self.password = 'foo'
+ self.location = 'TestLocation'
+ self.create_account('u1', self.student, self.password)
+ self.create_account('u2', self.instructor, self.password)
+ self.activate_user(self.student)
+ self.activate_user(self.instructor)
+
+ self.course_id = "edX/toy/2012_Fall"
+ self.toy = modulestore().get_course(self.course_id)
+
+ self.mock_service = peer_grading_service.peer_grading_service()
+
+ self.logout()
+
+ def test_get_next_submission_success(self):
+ self.login(self.student, self.password)
+
+ url = reverse('peer_grading_get_next_submission', kwargs={'course_id': self.course_id})
+ data = {'location': self.location}
+
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+ self.assertIsNotNone(d['submission_id'])
+ self.assertIsNotNone(d['prompt'])
+ self.assertIsNotNone(d['submission_key'])
+ self.assertIsNotNone(d['max_score'])
+
+ def test_get_next_submission_missing_location(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_get_next_submission', kwargs={'course_id': self.course_id})
+ data = {}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertFalse(d['success'])
+ self.assertEqual(d['error'], "Missing required keys: location")
+
+ def test_save_grade_success(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_save_grade', kwargs={'course_id': self.course_id})
+ data = {'location': self.location,
+ 'submission_id': '1',
+ 'submission_key': 'fake key',
+ 'score': '2',
+ 'feedback': 'This is feedback',
+ 'rubric_scores[]': [1, 2],
+ 'submission_flagged' : False}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+
+ def test_save_grade_missing_keys(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_save_grade', kwargs={'course_id': self.course_id})
+ data = {}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertFalse(d['success'])
+ self.assertTrue(d['error'].find('Missing required keys:') > -1)
+
+ def test_is_calibrated_success(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_is_student_calibrated', kwargs={'course_id': self.course_id})
+ data = {'location': self.location}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+ self.assertTrue('calibrated' in d)
+
+ def test_is_calibrated_failure(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_is_student_calibrated', kwargs={'course_id': self.course_id})
+ data = {}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertFalse(d['success'])
+ self.assertFalse('calibrated' in d)
+
+ def test_show_calibration_essay_success(self):
+ self.login(self.student, self.password)
+
+ url = reverse('peer_grading_show_calibration_essay', kwargs={'course_id': self.course_id})
+ data = {'location': self.location}
+
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+ self.assertIsNotNone(d['submission_id'])
+ self.assertIsNotNone(d['prompt'])
+ self.assertIsNotNone(d['submission_key'])
+ self.assertIsNotNone(d['max_score'])
+
+ def test_show_calibration_essay_missing_key(self):
+ self.login(self.student, self.password)
+
+ url = reverse('peer_grading_show_calibration_essay', kwargs={'course_id': self.course_id})
+ data = {}
+
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+
+ self.assertFalse(d['success'])
+ self.assertEqual(d['error'], "Missing required keys: location")
+
+ def test_save_calibration_essay_success(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_save_calibration_essay', kwargs={'course_id': self.course_id})
+ data = {'location': self.location,
+ 'submission_id': '1',
+ 'submission_key': 'fake key',
+ 'score': '2',
+ 'feedback': 'This is feedback',
+ 'rubric_scores[]': [1, 2]}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+ self.assertTrue('actual_score' in d)
+
+ def test_save_calibration_essay_missing_keys(self):
+ self.login(self.student, self.password)
+ url = reverse('peer_grading_save_calibration_essay', kwargs={'course_id': self.course_id})
+ data = {}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertFalse(d['success'])
+ self.assertTrue(d['error'].find('Missing required keys:') > -1)
+ self.assertFalse('actual_score' in d)
+
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index 69be36bf9c..dfba7b2599 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -202,6 +202,9 @@ def flagged_problem_list(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
def combined_notifications(request, course_id):
+ """
+ Gets combined notifications from the grading controller and displays them
+ """
course = get_course_with_access(request.user, course_id, 'load')
user = request.user
notifications = open_ended_notifications.combined_notifications(course, user)
@@ -250,9 +253,11 @@ def combined_notifications(request, course_id):
combined_dict
)
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
def take_action_on_flags(request, course_id):
"""
-
+ Takes action on student flagged submissions.
+ Currently, only support unflag and ban actions.
"""
if request.method != 'POST':
raise Http404
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 47bffac91e..0779f1f684 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -10,8 +10,23 @@ import json
from .common import *
from logsettings import get_logger_config
+import os
-############################### ALWAYS THE SAME ################################
+# specified as an environment variable. Typically this is set
+# in the service's upstart script and corresponds exactly to the service name.
+# Service variants apply config differences via env and auth JSON files,
+# the names of which correspond to the variant.
+SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
+
+# when not variant is specified we attempt to load an unvaried
+# config set.
+CONFIG_PREFIX = ""
+
+if SERVICE_VARIANT:
+ CONFIG_PREFIX = SERVICE_VARIANT + "."
+
+
+################### ALWAYS THE SAME ################################
DEBUG = False
TEMPLATE_DEBUG = False
@@ -25,14 +40,15 @@ MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
# IMPORTANT: With this enabled, the server must always be behind a proxy that
# strips the header HTTP_X_FORWARDED_PROTO from client requests. Otherwise,
# a user can fool our server into thinking it was an https connection.
-# See https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
+# See
+# https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
# for other warnings.
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-########################### NON-SECURE ENV CONFIG ##############################
+################# NON-SECURE ENV CONFIG ##############################
# Things like server locations, ports, etc.
-with open(ENV_ROOT / "env.json") as env_file:
+with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)
SITE_NAME = ENV_TOKENS['SITE_NAME']
@@ -55,18 +71,19 @@ LOGGING = get_logger_config(LOG_DIR,
logging_env=ENV_TOKENS['LOGGING_ENV'],
syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
local_loglevel=local_loglevel,
- debug=False)
+ debug=False,
+ service_variant=SERVICE_VARIANT)
COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {})
SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
-COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL",'')
-COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY",'')
+COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
+COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '')
CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
-############################## SECURE AUTH ITEMS ###############################
+############################## SECURE AUTH ITEMS ###############
# Secret things: passwords, access keys, etc.
-with open(ENV_ROOT / "auth.json") as auth_file:
+with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
AUTH_TOKENS = json.load(auth_file)
SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
@@ -84,8 +101,10 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE)
CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE)
-STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE', STAFF_GRADING_INTERFACE)
-PEER_GRADING_INTERFACE = AUTH_TOKENS.get('PEER_GRADING_INTERFACE', PEER_GRADING_INTERFACE)
+STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE',
+ STAFF_GRADING_INTERFACE)
+PEER_GRADING_INTERFACE = AUTH_TOKENS.get('PEER_GRADING_INTERFACE',
+ PEER_GRADING_INTERFACE)
PEARSON_TEST_USER = "pearsontest"
PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD")
diff --git a/lms/envs/common.py b/lms/envs/common.py
index edbec26933..8edf61e2b7 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -530,7 +530,7 @@ PIPELINE_COMPILERS = [
'pipeline.compilers.coffee.CoffeeScriptCompiler',
]
-PIPELINE_SASS_ARGUMENTS = '-t compressed -r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
+PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
diff --git a/lms/static/coffee/fixtures/staff_grading.html b/lms/static/coffee/fixtures/staff_grading.html
new file mode 100644
index 0000000000..2fe5a39a17
--- /dev/null
+++ b/lms/static/coffee/fixtures/staff_grading.html
@@ -0,0 +1,76 @@
+
+
+
+
Staff grading
+
+
+
+
+
+
+
+
+
+
Instructions
+
+
This is the list of problems that current need to be graded in order to train the machine learning models. Each problem needs to be trained separately, and we have indicated the number of student submissions that need to be graded in order for a model to be generated. You can grade more than the minimum required number of submissions--this will improve the accuracy of machine learning, though with diminishing returns. You can see the current accuracy of machine learning while grading.
@@ -41,12 +29,8 @@ describe 'Courseware', ->
"""
@courseware.render()
- it 'detect the video elements and convert them', ->
- expect(window.Video).toHaveBeenCalledWith('1', '1.0:abc1234')
- expect(window.Video).toHaveBeenCalledWith('2', '1.0:def5678')
-
- it 'detect the problem element and convert it', ->
- expect(window.Problem).toHaveBeenCalledWith(3, 'problem_3', '/example/url/')
+ it 'ensure that the XModules have been loaded', ->
+ expect(XModule.loadModules).toHaveBeenCalled()
it 'detect the histrogram element and convert it', ->
expect(window.Histogram).toHaveBeenCalledWith('3', [[0, 1]])
diff --git a/lms/static/coffee/spec/navigation_spec.coffee b/lms/static/coffee/spec/navigation_spec.coffee
index cb98c2b64c..1340984e52 100644
--- a/lms/static/coffee/spec/navigation_spec.coffee
+++ b/lms/static/coffee/spec/navigation_spec.coffee
@@ -16,6 +16,7 @@ describe 'Navigation', ->
active: 1
header: 'h3'
autoHeight: false
+ heightStyle: 'content'
describe 'when there is no active section', ->
beforeEach ->
@@ -23,11 +24,12 @@ describe 'Navigation', ->
$('#accordion').append('
')
new Navigation
- it 'activate the accordian with section 1 as active', ->
+ it 'activate the accordian with no section as active', ->
expect($('#accordion').accordion).toHaveBeenCalledWith
- active: 1
+ active: 0
header: 'h3'
autoHeight: false
+ heightStyle: 'content'
it 'binds the accordionchange event', ->
Navigation.bind()
diff --git a/lms/static/coffee/spec/staff_grading_spec.coffee b/lms/static/coffee/spec/staff_grading_spec.coffee
new file mode 100644
index 0000000000..595a9eb550
--- /dev/null
+++ b/lms/static/coffee/spec/staff_grading_spec.coffee
@@ -0,0 +1,11 @@
+describe 'StaffGrading', ->
+ beforeEach ->
+ spyOn Logger, 'log'
+ @mockBackend = new StaffGradingBackend('url', true)
+
+ describe 'constructor', ->
+ beforeEach ->
+ @staff_grading = new StaffGrading(@mockBackend)
+
+ it 'we are originally in the list view', ->
+ expect(@staff_grading.list_view).toBe(true)
diff --git a/lms/static/coffee/src/open_ended/open_ended.coffee b/lms/static/coffee/src/open_ended/open_ended.coffee
index aff1e5fc67..cc8bad5473 100644
--- a/lms/static/coffee/src/open_ended/open_ended.coffee
+++ b/lms/static/coffee/src/open_ended/open_ended.coffee
@@ -23,8 +23,8 @@ class OpenEnded
parent_tr = $(event.target).parent().parent()
tr_children = parent_tr.children()
action_type = "unflag"
- submission_id = tr_children[5].innerText
- student_id = tr_children[6].innerText
+ submission_id = parent_tr.data('submission-id')
+ student_id = parent_tr.data('student-id')
callback_func = @after_action_wrapper($(event.target), action_type)
@post('take_action_on_flags', {'submission_id' : submission_id, 'student_id' : student_id, 'action_type' : action_type}, callback_func)
@@ -33,8 +33,8 @@ class OpenEnded
parent_tr = $(event.target).parent().parent()
tr_children = parent_tr.children()
action_type = "ban"
- submission_id = tr_children[5].innerText
- student_id = tr_children[6].innerText
+ submission_id = parent_tr.data('submission-id')
+ student_id = parent_tr.data('student-id')
callback_func = @after_action_wrapper($(event.target), action_type)
@post('take_action_on_flags', {'submission_id' : submission_id, 'student_id' : student_id, 'action_type' : action_type}, callback_func)
@@ -51,7 +51,8 @@ class OpenEnded
return @handle_after_action
handle_after_action: (data) ->
- blah = "blah"
+ if !data.success
+ @gentle_alert data.error
gentle_alert: (msg) =>
if $('.message-container').length
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index c7a8a01bab..005a8e682e 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -9,9 +9,13 @@ state_graded = "graded"
state_no_data = "no_data"
state_error = "error"
-class StaffGradingBackend
+class @StaffGradingBackend
constructor: (ajax_url, mock_backend) ->
@ajax_url = ajax_url
+ # prevent this from trying to make requests when we don't have
+ # a proper url
+ if !ajax_url
+ mock_backend = true
@mock_backend = mock_backend
if @mock_backend
@mock_cnt = 0
@@ -142,7 +146,7 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
.error => callback({success: false, error: "Error occured while performing this operation"})
-class StaffGrading
+class @StaffGrading
constructor: (backend) ->
@backend = backend
diff --git a/lms/static/images/press/releases/eric-lander-lab.jpg b/lms/static/images/press/releases/eric-lander-lab.jpg
new file mode 100644
index 0000000000..54f027775d
Binary files /dev/null and b/lms/static/images/press/releases/eric-lander-lab.jpg differ
diff --git a/lms/static/images/press/releases/eric-lander-lab_x300.jpg b/lms/static/images/press/releases/eric-lander-lab_x300.jpg
new file mode 100644
index 0000000000..38c4a208ed
Binary files /dev/null and b/lms/static/images/press/releases/eric-lander-lab_x300.jpg differ
diff --git a/lms/static/images/press/releases/eric-lander_240x180.jpg b/lms/static/images/press/releases/eric-lander_240x180.jpg
new file mode 100644
index 0000000000..ee5b2d875b
Binary files /dev/null and b/lms/static/images/press/releases/eric-lander_240x180.jpg differ
diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss
index 20e75dbe0d..bfd90505cf 100644
--- a/lms/static/sass/course/_info.scss
+++ b/lms/static/sass/course/_info.scss
@@ -65,6 +65,11 @@ div.info-wrapper {
list-style-type: disc;
}
+ > ol {
+ list-style: decimal outside none;
+ padding: 0 0 0 1em;
+ }
+
li {
margin-bottom: lh(.5);
}
diff --git a/lms/static/sass/course/_syllabus.scss b/lms/static/sass/course/_syllabus.scss
index 4b38d8717c..405f0412d3 100644
--- a/lms/static/sass/course/_syllabus.scss
+++ b/lms/static/sass/course/_syllabus.scss
@@ -13,7 +13,7 @@ div.syllabus {
}
table {
-
+ table-layout: auto;
text-align: left;
margin: 10px 0;
@@ -25,18 +25,19 @@ div.syllabus {
tr.first {
td {
- padding-top: 15px;
+ padding-top: 15px !important;
}
- }
+ }
td {
-
+ border: none !important;
+ padding: 5px 10px !important;
vertical-align: middle;
-
- padding: 5px 10px;
+ font-size: 1em !important;
+ line-height: auto;
&.day, &.due, &.slides, &.assignment {
- white-space: nowrap;
+ white-space: nowrap !important;
}
&.no_class {
@@ -48,16 +49,12 @@ div.syllabus {
}
&.week_separator {
- padding: 0px;
+ padding: 0px !important;
hr {
margin: 10px;
}
-
}
-
}
-
}
-
}
diff --git a/lms/templates/conditional_ajax.html b/lms/templates/conditional_ajax.html
new file mode 100644
index 0000000000..0a5887be04
--- /dev/null
+++ b/lms/templates/conditional_ajax.html
@@ -0,0 +1 @@
+
diff --git a/lms/templates/conditional_module.html b/lms/templates/conditional_module.html
new file mode 100644
index 0000000000..e9a42b95ce
--- /dev/null
+++ b/lms/templates/conditional_module.html
@@ -0,0 +1,9 @@
+<%
+ from django.core.urlresolvers import reverse
+ reqm = module.required_modules[0]
+ course_id = module.system.course_id
+%>
+
+
Yes. Online learners who demonstrate mastery of subjects can earn a certificate of mastery. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future.
+
Yes. Online learners who demonstrate mastery of subjects can earn a certificate
+ of mastery. Certificates will be issued at the discretion of edX and the underlying
+ X University that offered the course under the name of the underlying "X
+ University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX.
+ For the courses in Fall 2012, those certificates will be free. There is a plan to
+ charge a modest fee for certificates in the future. Note: At this time, edX is
+ holding certificates for learners connected with Cuba, Iran, Syria and Sudan
+ pending confirmation that the issuance is in compliance with U.S. embargoes.
What will the scope of the online courses be? How many? Which faculty?
Will I get a certificate for taking an edX course?
-
-
Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.
+
+
Online learners who receive a passing grade for a course will receive a certificate
+ of mastery at the discretion of edX and the underlying X University that offered
+ the course. For example, a certificate of mastery for MITx’s 6.002x Circuits &
+ Electronics will come from edX and MITx.
+
If you passed the course, your certificate of mastery will be delivered online
+ through edx.org. So be sure to check your email in the weeks following the final
+ grading – you will be able to download and print your certificate. Note: At this
+ time, edX is holding certificates for learners connected with Cuba, Iran, Syria
+ and Sudan pending confirmation that the issuance is in compliance with U.S.
+ embargoes.
Pilot project offers online courses, educational support and jobs training through Boston community centers
CAMBRIDGE, MA – January 29, 2013 –
-EdX, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a pilot project with the City of Boston, Harvard and MIT to make online courses available through internet-connected Boston neighborhood community centers, high schools and libraries. A first-of-its-kind project, BostonX brings together innovators from the country’s center of higher education to offer Boston residents access to courses, internships, job training and placement services, and locations for edX students to gather, socialize and deepen learning.
+EdX, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a pilot project with the City of Boston, Harvard and MIT to make online courses available through internet-connected Boston neighborhood community centers, high schools and libraries. A first-of-its-kind project, BostonX brings together innovators from the country’s center of higher education to offer Boston residents access to courses, internships, job training and placement services, and locations for edX students to gather, socialize and deepen learning.
“We must connect adults and youth in our neighborhoods with the opportunities of the knowledge economy,” said Mayor Tom Menino. “BostonX will help update our neighbors’ skills and our community centers. As a first step, I’m pleased to announce a pilot with Harvard, MIT and edX, their online learning initiative, which will bring free courses and training to our community centers.”
diff --git a/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html b/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html
new file mode 100644
index 0000000000..d91c8091d7
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html
@@ -0,0 +1,92 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title">Human Genome Pioneer Eric Lander to reveal “the secret of life”
+
+
+
+
+
+
Human Genome Pioneer Eric Lander to reveal “the secret of life”
+
+
+
Broad Institute Director shares his MIT introductory biology course, covering topics in biochemistry, genetics and genomics, through edX.
+
+
+
+
+
Eric Lander, the founding director of the Broad Institute and a professor at MIT and Harvard Medical School.
CAMBRIDGE, MA – January 30, 2013 –
+In the past 10 years, the ability to decode or “sequence” DNA has grown by a million-fold, a stunning rate of progress that is producing a flood of information about human biology and disease. Because of these advances, the scientific community — and the world as a whole — stands on the verge of a revolution in biology. In the coming decades scientists will be able to understand how cells are “wired” and how that wiring is disrupted in human diseases ranging from diabetes to cancer to schizophrenia. Now, with his free online course, 7.00x Introductory Biology: “The Secret of Life”, genome pioneer Eric Lander, the founding director of the Broad Institute and a professor at MIT and Harvard Medical School, will explain to students around the world the basics of biology – the secret of life, so to speak – so that they can understand today’s revolution in biology.
+
+
EdX, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), brings the best courses from the best faculty at the best institutions to anyone with an Internet connection. For the past 20 years, legendary teacher Lander has taught Introductory Biology to more than half of all MIT students. He has now adapted his course for online education, creating the newest course on the edX platform. The course, 7.00X, is now open for enrollment, with the first class slated for March 5th. This course will include innovative technology including a 3D molecule viewer and gene explorer tool to transform the learning experience. It is open to all levels and types of learners.
+
+
“Introducing the freshman class of MIT to the basics of biology is exhilarating,” said Lander. “Now, with this edX course, I look forward to teaching people around the world. There are no prerequisites for this course – other than curiosity and an interest in understanding some of the greatest scientific challenges of our time.”
+
+
Those taking the course will learn the fundamental ideas that underlie modern biology and medicine, including genetics, biochemistry, molecular biology, recombinant DNA, genomics and genomic medicine. They will become familiar with the structure and function of macromolecules such as DNA, RNA and proteins and understand how information flows within cells. Students will explore how mutations affect biological function and cause human disease. They will learn about modern molecular biological techniques and their wide-ranging impact.
+
+
“Eric Lander has created this remarkable digitally enhanced introduction to genetics and biology,” said Anant Agarwal, President of edX. “With this unique online version, he has brought the introductory biology course to a new level. It has been completely rethought and retooled, incorporating cutting-edge online interactive tools as well as community-building contests and milestone-based prizes.”
+
+
With online courses through edX like 7.00x, what matters isn’t what people have achieved or their transcripts, but their desire to learn. Students only need to come with a real interest in science and the desire to understand what's going on at the forefront of biology, and to learn the fundamental principles on which an amazing biomedical revolution is based – from one of the top scientist in the world. 7.00x Introductory Biology: The Secret of Life is now available for enrollment. Classes will start on March 5, 2013.
+
+
Dr. Eric Lander is President and Founding Director of the Broad Institute of Harvard and MIT, a new kind of collaborative biomedical research institution focused on genomic medicine. Dr. Lander is also Professor of Biology at MIT and Professor of Systems Biology at the Harvard Medical School. In addition, Dr. Lander serves as Co-Chair of the President’s Council of Advisors on Science and Technology, which advises the White House on science and technology. A geneticist, molecular biologist and mathematician, Dr. Lander has played a pioneering role in all aspects of the reading, understanding and medical application of the human genome. He was a principal leader of the international Human Genome Project (HGP) from 1990-2003, with his group being the largest contributor to the mapping and sequencing of the human genetic blueprint. Dr. Lander was an early pioneer in the free availability of genomic tools and information. Finally, he has mentored an extraordinary cadre of young scientists who have become the next generation of leaders in medical genomics. The recipient of numerous awards and honorary degrees, Dr. Lander was elected a member of the U.S. National Academy of Sciences in 1997 and of the U.S. Institute of Medicine in 1999.
The Eli and Edythe L. Broad Institute of MIT and Harvard was founded in 2003 to empower this generation of creative scientists to transform medicine with new genome-based knowledge. The Broad Institute seeks to describe all the molecular components of life and their connections; discover the molecular basis of major human diseases; develop effective new approaches to diagnostics and therapeutics; and disseminate discoveries, tools, methods and data openly to the entire scientific community.
+
+
Founded by MIT, Harvard and its affiliated hospitals, and the visionary Los Angeles philanthropists Eli and Edythe L. Broad, the Broad Institute includes faculty, professional staff and students from throughout the MIT and Harvard biomedical research communities and beyond, with collaborations spanning over a hundred private and public institutions in more than 40 countries worldwide. For further information about the Broad Institute, go to www.broadinstitute.org.
+
+
About edX
+
+
EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.
EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.
})
})
+ })
+