Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/static-tab-reordering

Gemfile

 source :rubygems
-ruby "1.8.7"
 gem 'rake', '~> 10.0.3'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

common/djangoapps/course_groups/tests/tests.py

@@ -10,6 +10,25 @@ from course_groups.cohorts import (get_cohort, get_course_cohorts,
 
 from xmodule.modulestore.django import modulestore, _MODULESTORES
 
+# NOTE: running this with the lms.envs.test config works without
+# manually overriding the modulestore.  However, running with
+# cms.envs.test doesn't.  
+
+def xml_store_config(data_dir):
+    return {
+    'default': {
+        'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
+        'OPTIONS': {
+            'data_dir': data_dir,
+            'default_class': 'xmodule.hidden_module.HiddenDescriptor',
+        }
+    }
+}
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
+TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
+
+@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestCohorts(django.test.TestCase):
 
 
@@ -77,7 +96,7 @@ class TestCohorts(django.test.TestCase):
         course = modulestore().get_course("edX/toy/2012_Fall")
         self.assertEqual(course.id, "edX/toy/2012_Fall")
         self.assertFalse(course.is_cohorted)
-        
+
         user = User.objects.create(username="test", email="a@b.com")
         other_user = User.objects.create(username="test2", email="a2@b.com")
 

common/djangoapps/student/management/commands/tests/test_pearson.py

@@ -40,6 +40,7 @@ def create_tc_registration(username, course_id = 'org1/course1/term1', exam_code
                'eligibility_appointment_date_first' : '2013-01-01T00:00',
                'eligibility_appointment_date_last' : '2013-12-31T23:59',
                'accommodation_code' : accommodation_code, 
+               'create_dummy_exam' : True,
                }
 
     call_command('pearson_make_tc_registration', username, course_id, **options)
@@ -179,11 +180,11 @@ class PearsonCommandTestCase(PearsonTestCase):
         self.assertErrorContains(error_string, 'Field Form Error:  address_1')
         
     def test_create_good_testcenter_user(self):
-        testcenter_user = create_tc_user("test1")
+        testcenter_user = create_tc_user("test_good_user")
         self.assertIsNotNone(testcenter_user)
         
     def test_create_good_testcenter_registration(self):
-        username = 'test1'
+        username = 'test_good_registration'
         create_tc_user(username)
         registration = create_tc_registration(username)
         self.assertIsNotNone(registration)

common/lib/xmodule/xmodule/modulestore/xml_importer.py

@@ -247,7 +247,7 @@ def remap_namespace(module, target_location_namespace):
 
     return module
 
-def validate_category_hierarcy(module_store, course_id, parent_category, expected_child_category):
+def validate_category_hierarchy(module_store, course_id, parent_category, expected_child_category):
     err_cnt = 0
 
     parents = []
@@ -324,11 +324,18 @@ def perform_xlint(data_dir, course_dirs,
 
     for course_id in module_store.modules.keys():
         # constrain that courses only have 'chapter' children
-        err_cnt += validate_category_hierarcy(module_store, course_id, "course", "chapter")
+        err_cnt += validate_category_hierarchy(module_store, course_id, "course", "chapter")
         # constrain that chapters only have 'sequentials'
-        err_cnt += validate_category_hierarcy(module_store, course_id, "chapter", "sequential")
+        err_cnt += validate_category_hierarchy(module_store, course_id, "chapter", "sequential")
         # constrain that sequentials only have 'verticals'
-        err_cnt += validate_category_hierarcy(module_store, course_id, "sequential", "vertical")
+        err_cnt += validate_category_hierarchy(module_store, course_id, "sequential", "vertical")
+
+        # check for a presence of a course marketing video
+        location_elements = course_id.split('/')
+        if Location(['i4x', location_elements[0], location_elements[1], 'about', 'video', None]) not in module_store.modules[course_id]:
+            print "WARN: Missing course marketing video. It is recommended that every course have a marketing video."
+            warn_cnt += 1
+
 
     print "\n\n------------------------------------------\nVALIDATION SUMMARY: {0} Errors   {1} Warnings\n".format(err_cnt, warn_cnt)
 

lms/envs/test.py

@@ -17,7 +17,7 @@ from path import path
 MITX_FEATURES['DISABLE_START_DATES'] = True
 
 # Until we have discussion actually working in test mode, just turn it off
-#MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
+MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
 
 # Need wiki for courseware views to work. TODO (vshnayder): shouldn't need it.
 WIKI_ENABLED = True

lms/static/coffee/src/navigation.coffee

@@ -13,6 +13,7 @@ class @Navigation
         active: active
         header: 'h3'
         autoHeight: false
+        heightStyle: 'content'
       $('#accordion .ui-state-active').closest('.chapter').addClass('is-open')
       $('#open_close_accordion a').click @toggle
       $('#accordion').show()

lms/templates/static_templates/faq.html

@@ -84,7 +84,7 @@
 
     <nav class="categories">
       <a href="#organization">Organization</a>
-      <a href="#students">Students</a>
+      <a href="${reverse('help_edx')}">Students</a>
       <a href="#technology-platform">Technology Platform</a>
     </nav>
   </section>

lms/templates/static_templates/jobs.html

@@ -51,6 +51,40 @@
         </div>
       </article>
 
+
+        <article id="associate-legal-counsel" class="job">
+        <div class="inner-wrapper">
+          <h3><strong>ASSOCIATE LEGAL COUNSEL</strong></h3>
+
+          <p>We are seeking a talented lawyer with the ability to operate independently in a fast-paced environment and work proactively with all members of the edX team. You must have thorough knowledge of intellectual property law, contracts and licensing. </p>
+
+          <p><strong>Key Responsibilities: </strong></p>
+          <ul>
+            <li>Drive the negotiating, reviewing, drafting and overseeing of a wide range of transactional arrangements, including collaborations related to the provision of online education, inbound and outbound licensing of intellectual property, strategic partnerships, nondisclosure agreements, and services agreements.</li>
+            <li>Provide counseling on the legal implications/considerations of business and technical strategies and projects, with special emphasis on regulations related to higher education, data security and privacy.</li>
+            <li>Provide advice and support company-wide on a variety of legal issues in a timely and effective manner.</li>
+            <li>Assist on other matters as needed.</li>
+          </ul>
+
+          <p><strong>Requirements:</strong></p>
+          <li>JD from an accredited law school</li>
+          <li>Massachusetts bar admission required</li>
+          <li>2-3 years of transactional experience at a major law firm and/or as an in-house counselor</li>
+          <li>Substantial IP licensing experience</li>
+          <li>Knowledge of copyright, trademark and patent law</li>
+          <li>Experience with open source content and open source software preferred</li>
+          <li>Outstanding communications skills (written and oral)</li>
+          <li>Experience with drafting and legal review of internet privacy policies and terms of use.</li>
+          <li>Understanding of how to balance legal risks with business objectives</li>
+          <li>Ability to develop an innovative approach to legal issues in support of strategic business initiatives</li>
+          <li>An internal business and customer focused proactive attitude with ability to prioritize effectively</li>
+          <li>Experience with higher education preferred but not required</li>
+        </ul>
+        <p>If you are interested in this position, please send an email to <a href="mailto:jobs@edx.org">jobs@edx.org</a>.</p>
+
+      </div>
+      </article>
+
       <article id="instructional-designer" class="job">
         <div class="inner-wrapper">
         <h3><strong>INSTRUCTIONAL DESIGNER</strong> &mdash; CONTRACT OPPORTUNITY</h3>