From f4c1a8f27b7fd8cc006a8116a983b219d397d0ab Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Wed, 4 Sep 2013 09:21:07 -0400 Subject: [PATCH 1/2] Update the carousel with which step the user is on --- lms/static/js/verify_student/photocapture.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lms/static/js/verify_student/photocapture.js b/lms/static/js/verify_student/photocapture.js index 4bb52ef87a..94fdb5f570 100644 --- a/lms/static/js/verify_student/photocapture.js +++ b/lms/static/js/verify_student/photocapture.js @@ -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(); From 41e3ffc216c1de6d3380845ee7e3ca9c93a8745f Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 4 Sep 2013 09:28:30 -0400 Subject: [PATCH 2/2] Enable developer local overrides to acceptance settings --- cms/envs/acceptance.py | 7 +++++++ lms/envs/acceptance.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 3b89e2e988..6c32592589 100644 --- a/cms/envs/acceptance.py +++ b/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 diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 34112566ee..6a63653528 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -114,3 +114,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