Merge branch 'dcadams/cme_registration' into edx-west/rc-20130912

Conflicts:
	common/djangoapps/student/views.py
	lms/envs/common.py

cms/envs/test.py

@@ -150,3 +150,6 @@ MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True
 
 # This is to disable a test under the common directory that will not pass when run under CMS
 MITX_FEATURES['DISABLE_PASSWORD_RESET_EMAIL_TEST'] = True
+
+# This is to disable tests CME Registration tests, under common, that will not pass when run under CMS
+MITX_FEATURES['DISABLE_CME_REGISTRATION_TESTS'] = True

common/djangoapps/cme_registration/__init__.py

+"""
+CME Registration app
+"""

common/djangoapps/cme_registration/tests/__init__.py

+"""
+Tests for CME Registration
+"""

common/djangoapps/student/views.py

@@ -56,7 +56,7 @@ from courseware.access import has_access
 from external_auth.models import ExternalAuthMap
 
 from bulk_email.models import Optout
-
+from cme_registration.views import cme_register_user, cme_create_account
 import track.views
 
 from statsd import statsd
@@ -242,6 +242,9 @@ def register_user(request, extra_context=None):
     """
     This view will display the non-modal registration form
     """
+    if settings.MITX_FEATURES.get('USE_CME_REGISTRATION'):
+        return cme_register_user(request, extra_context=extra_context)
+
     if request.user.is_authenticated():
         return redirect(reverse('dashboard'))
 
@@ -599,6 +602,9 @@ def create_account(request, post_override=None):
     JSON call to create new edX account.
     Used by form in signup_modal.html, which is included into navigation.html
     """
+    if settings.MITX_FEATURES.get('USE_CME_REGISTRATION'):
+        return cme_create_account(request, post_override=post_override)
+
     js = {'success': False}
 
     post_vars = post_override if post_override else request.POST

lms/djangoapps/courseware/tests/helpers.py

@@ -48,6 +48,9 @@ class LoginEnrollmentTestCase(TestCase):
     Provides support for user creation,
     activation, login, and course enrollment.
     """
+    def setUp(self):
+        from django.conf import settings
+
     def setup_user(self):
         """
         Create a user account, activate, and log in.

lms/envs/common.py

@@ -172,6 +172,9 @@ MITX_FEATURES = {
 
     # Toggle storing detailed billing information
     'STORE_BILLING_INFO': False,
+
+    #Toggle using CME registration instead of normal
+    'USE_CME_REGISTRATION': False
 }
 
 # Used for A/B testing
@@ -836,6 +839,10 @@ INSTALLED_APPS = (
 
     # Student Identity Verification
     'verify_student',
+
+    # CME Registration
+    'cme_registration',
+
 )
 
 ######################### MARKETING SITE ###############################

lms/static/sass/multicourse/_account.scss

@@ -211,11 +211,11 @@
     fieldset {
       margin: 0;
       padding-top: 0;
-      padding-bottom: $baseline;
+      padding-bottom: $baseline*2;
     }
 
     .list-input {
-      margin: 0;
+      margin: 0 0 0 25px;
       padding: 0;
       list-style: none;
     }
@@ -305,9 +305,9 @@
       }
 
       // types - checkboxes/radio buttons
-      &.checkbox {
+      &.checkbox, .radio {
 
-        input[type="checkbox"] {
+        input[type="checkbox"], input[type="radio"] {
           display: inline-block;
           width: auto;
           margin-right: ($baseline/4);