Commit e7c07d4e by David Ormsbee

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

parents 78acd083 41e3ffc2
......@@ -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
......@@ -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
......@@ -175,8 +175,17 @@ $(document).ready(function() {
$("#confirm_pics_good").change(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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment