Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3

cms/envs/acceptance.py

@@ -86,3 +86,10 @@ INSTALLED_APPS += ('lettuce.django',)
 LETTUCE_APPS = ('contentstore',)
 LETTUCE_SERVER_PORT = choice(PORTS) if SAUCE.get('SAUCE_ENABLED') else randint(1024, 65535)
 LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome')
+
+#####################################################################
+# Lastly, see if the developer has any local overrides.
+try:
+    from .private import *      # pylint: disable=F0401
+except ImportError:
+    pass

lms/envs/acceptance.py

@@ -120,3 +120,10 @@ INSTALLED_APPS += ('lettuce.django',)
 LETTUCE_APPS = ('courseware',)
 LETTUCE_SERVER_PORT = choice(PORTS) if SAUCE.get('SAUCE_ENABLED') else randint(1024, 65535)
 LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome')
+
+#####################################################################
+# Lastly, see if the developer has any local overrides.
+try:
+    from .private import *      # pylint: disable=F0401
+except ImportError:
+    pass

lms/static/js/verify_student/photocapture.js

@@ -176,7 +176,16 @@ $(document).ready(function() {
       $("#pay_button").toggleClass('disabled');
   });
 
-  $("#pay_button_frame").addClass('disabled');
+  
+  // add in handlers to add/remove the correct classes to the body
+  // when moving between steps
+  $('#face_next_button').click(function(){ 
+      $('body').addClass('step-photos-id').removeClass('step-photos-cam')
+  })
+
+  $('#photo_id_next_button').click(function(){ 
+      $('body').addClass('step-review').removeClass('step-photos-id')
+  })
 
   var hasHtml5CameraSupport = initVideoCapture();