Merge branch 'master' into release

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

cms/djangoapps/contentstore/views/component.py

@@ -306,7 +306,7 @@ def container_handler(request, tag=None, package_id=None, branch=None, version_g
     if 'text/html' in request.META.get('HTTP_ACCEPT', 'text/html'):
         locator = BlockUsageLocator(package_id=package_id, branch=branch, version_guid=version_guid, block_id=block)
         try:
-            old_location, course, xblock, __ = _get_item_in_course(request, locator)
+            __, course, xblock, __ = _get_item_in_course(request, locator)
         except ItemNotFoundError:
             return HttpResponseBadRequest()
 

cms/djangoapps/contentstore/views/public.py

@@ -44,6 +44,10 @@ def login_page(request):
         # to course now that the user is authenticated via
         # the decorator.
         return redirect('/course')
+    if settings.FEATURES.get('AUTH_USE_CAS'):
+        # If CAS is enabled, redirect auth handling to there
+        return redirect(reverse('cas-login'))
+
     return render_to_response(
         'login.html',
         {

cms/djangoapps/contentstore/views/tests/test_helpers.py

@@ -12,33 +12,42 @@ class HelpersTestCase(CourseTestCase):
     Unit tests for helpers.py.
     """
     def test_xblock_studio_url(self):
+        course = self.course
+
         # Verify course URL
-        self.assertEqual(xblock_studio_url(self.course),
+        self.assertEqual(xblock_studio_url(course),
                          u'/course/MITx.999.Robot_Super_Course/branch/published/block/Robot_Super_Course')
 
         # Verify chapter URL
         chapter = ItemFactory.create(parent_location=self.course.location, category='chapter',
                                      display_name="Week 1")
         self.assertIsNone(xblock_studio_url(chapter))
+        self.assertIsNone(xblock_studio_url(chapter, course))
 
         # Verify lesson URL
         sequential = ItemFactory.create(parent_location=chapter.location, category='sequential',
                                         display_name="Lesson 1")
         self.assertIsNone(xblock_studio_url(sequential))
+        self.assertIsNone(xblock_studio_url(sequential, course))
 
         # Verify vertical URL
         vertical = ItemFactory.create(parent_location=sequential.location, category='vertical',
                                       display_name='Unit')
         self.assertEqual(xblock_studio_url(vertical),
                          u'/unit/MITx.999.Robot_Super_Course/branch/published/block/Unit')
+        self.assertEqual(xblock_studio_url(vertical, course),
+                         u'/unit/MITx.999.Robot_Super_Course/branch/published/block/Unit')
 
         # Verify child vertical URL
         child_vertical = ItemFactory.create(parent_location=vertical.location, category='vertical',
                                             display_name='Child Vertical')
         self.assertEqual(xblock_studio_url(child_vertical),
                          u'/container/MITx.999.Robot_Super_Course/branch/published/block/Child_Vertical')
+        self.assertEqual(xblock_studio_url(child_vertical, course),
+                         u'/container/MITx.999.Robot_Super_Course/branch/published/block/Child_Vertical')
 
         # Verify video URL
         video = ItemFactory.create(parent_location=child_vertical.location, category="video",
                                    display_name="My Video")
         self.assertIsNone(xblock_studio_url(video))
+        self.assertIsNone(xblock_studio_url(video, course))

cms/envs/aws.py

@@ -181,6 +181,16 @@ PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX')
 if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
     TRACKING_IGNORE_URL_PATTERNS = ENV_TOKENS.get("TRACKING_IGNORE_URL_PATTERNS")
 
+# Django CAS external authentication settings
+CAS_EXTRA_LOGIN_PARAMS = ENV_TOKENS.get("CAS_EXTRA_LOGIN_PARAMS", None)
+if FEATURES.get('AUTH_USE_CAS'):
+    CAS_SERVER_URL = ENV_TOKENS.get("CAS_SERVER_URL", None)
+    AUTHENTICATION_BACKENDS = (
+        'django.contrib.auth.backends.ModelBackend',
+        'django_cas.backends.CASBackend',
+    )
+    INSTALLED_APPS += ('django_cas',)
+    MIDDLEWARE_CLASSES += ('django_cas.middleware.CASMiddleware',)
 
 ################ SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.

cms/static/sass/elements/_xmodules.scss

@@ -22,6 +22,15 @@
     .video-controls .add-fullscreen {
       display: none !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
     }
+
+    .video-tracks {
+      .a11y-menu-container {
+        .a11y-menu-list {
+          bottom: 100%;
+          top: auto;
+        }
+      }
+    }
   }
 }
 

cms/static/sass/views/_unit.scss

@@ -1399,7 +1399,7 @@ body.unit .xblock-type-container {
 // UI: special case discussion, HTML xmodule styling
 
 body.unit .component {
-  .xmodule_DiscussionModule, .xmodule_HtmlModule {
+  .xmodule_DiscussionModule, .xmodule_HtmlModule, .xblock {
     margin-top: ($baseline*1.5);
   }
 }

cms/urls.py

@@ -115,6 +115,12 @@ if settings.FEATURES.get('ENABLE_SERVICE_STATUS'):
         url(r'^status/', include('service_status.urls')),
     )
 
+if settings.FEATURES.get('AUTH_USE_CAS'):
+    urlpatterns += (
+        url(r'^cas-auth/login/$', 'external_auth.views.cas_login', name="cas-login"),
+        url(r'^cas-auth/logout/$', 'django_cas.views.logout', {'next_page': '/'}, name="cas-logout"),
+    )
+
 urlpatterns += patterns('', url(r'^admin/', include(admin.site.urls)),)
 
 # enable automatic login