diff --git a/lms/static/js/spec/verify_student/make_payment_step_view_spec.js b/lms/static/js/spec/verify_student/make_payment_step_view_spec.js index 01abb15433..eb0fa26ecb 100644 --- a/lms/static/js/spec/verify_student/make_payment_step_view_spec.js +++ b/lms/static/js/spec/verify_student/make_payment_step_view_spec.js @@ -86,16 +86,10 @@ define([ }; var expectPaymentDisabledBecauseInactive = function() { - var payButton = $( '#pay_button'), - activateButton = $( '#activate_button' ); + var payButton = $( '#pay_button' ); // Payment button should be hidden expect( payButton.length ).toEqual(0); - - // Activate button should be displayed and disabled - expect( activateButton.length ).toEqual(1); - expect( activateButton.hasClass( 'is-disabled' ) ).toBe( true ); - expect( activateButton.prop( 'disabled' ) ).toBe( true ); }; var goToPayment = function( requests, kwargs ) { diff --git a/lms/static/js/verify_student/views/make_payment_step_view.js b/lms/static/js/verify_student/views/make_payment_step_view.js index 641f3e15d4..225d2e6e93 100644 --- a/lms/static/js/verify_student/views/make_payment_step_view.js +++ b/lms/static/js/verify_student/views/make_payment_step_view.js @@ -38,11 +38,6 @@ var edx = edx || {}; // Set the payment button to disabled by default this.setPaymentEnabled( false ); - // The activate button is always disabled - $( '#activate_button' ) - .addClass( 'is-disabled' ) - .prop( 'disabled', true ); - // Update the contribution amount with the amount the user // selected in a previous screen. if ( templateContext.contributionAmount ) { diff --git a/lms/static/sass/views/_decoupled-verification.scss b/lms/static/sass/views/_decoupled-verification.scss index 5f6a4bf014..7cdef0bf63 100644 --- a/lms/static/sass/views/_decoupled-verification.scss +++ b/lms/static/sass/views/_decoupled-verification.scss @@ -23,6 +23,12 @@ } } + .placeholder-cam { + .copy { + font-weight: bold !important; + } + } + .requirements-container { .list-reqs { @@ -41,7 +47,7 @@ } &.account-not-activated { - width: 990px; + width: 300px; .req { height: 290px; @@ -75,6 +81,7 @@ display: inline; float: left; line-height: 45px; + color: black; } .wizard-steps { @@ -119,11 +126,23 @@ .expandable-area { margin-top: 5px; + padding-bottom: 20px; } } .help-tips { margin-left: 0 !important; + + .title { + font-size: 16px !important; + } + + .list-tips { + .tip { + font-size: 16px; + line-height: 1.5em; + } + } } .photo-tip { @@ -137,6 +156,12 @@ padding-left: 20px; } + .list-faq { + dd { + color: black; + } + } + .wrapper-task { .msg-retake { margin-top: 0; diff --git a/lms/templates/verify_student/intro_step.underscore b/lms/templates/verify_student/intro_step.underscore index b85e35792e..2d467deb84 100644 --- a/lms/templates/verify_student/intro_step.underscore +++ b/lms/templates/verify_student/intro_step.underscore @@ -9,7 +9,13 @@ <% } else { %>

<%- introTitle %>

- <% if ( introMsg ) { %> + <% if ( !isActive ) { %> +
+

+ <%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %> +

+
+ <% } else if ( introMsg ) { %>

<%- introMsg %>

<% } %> <% } %> @@ -17,69 +23,63 @@
- <% if ( nextStepTitle ) { %> + <% if ( nextStepTitle && isActive ) { %> diff --git a/lms/templates/verify_student/make_payment_step.underscore b/lms/templates/verify_student/make_payment_step.underscore index e2f6936cb0..389436b232 100644 --- a/lms/templates/verify_student/make_payment_step.underscore +++ b/lms/templates/verify_student/make_payment_step.underscore @@ -105,6 +105,8 @@ gettext( "You can pay now even if you don't have the following items available, but you will need to have these by %(date)s to qualify to earn a Verified Certificate." ), { date: verificationDeadline } ) %> + <% } else if ( !isActive ) { %> + <%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %> <% } else if ( !upgrade ) { %> <%- gettext( "You can pay now even if you don't have the following items available, but you will need to have these to qualify to earn a Verified Certificate." ) %> <% } %> @@ -116,66 +118,60 @@
<% } %> + <% if ( isActive ) { %> + <% } %>
diff --git a/lms/templates/verify_student/pay_and_verify.html b/lms/templates/verify_student/pay_and_verify.html index a807722137..d5aef5cf8f 100644 --- a/lms/templates/verify_student/pay_and_verify.html +++ b/lms/templates/verify_student/pay_and_verify.html @@ -76,6 +76,7 @@ from verify_student.views import PayAndVerifyView data-is-active='${is_active}' > + % if is_active: ## Support
+ % endif diff --git a/lms/templates/verify_student/payment_confirmation_step.underscore b/lms/templates/verify_student/payment_confirmation_step.underscore index 615f3d57c2..45d98e5eef 100644 --- a/lms/templates/verify_student/payment_confirmation_step.underscore +++ b/lms/templates/verify_student/payment_confirmation_step.underscore @@ -83,49 +83,49 @@
diff --git a/lms/templates/verify_student/review_photos_step.underscore b/lms/templates/verify_student/review_photos_step.underscore index 351c5c0a0b..087de85b4d 100644 --- a/lms/templates/verify_student/review_photos_step.underscore +++ b/lms/templates/verify_student/review_photos_step.underscore @@ -35,7 +35,7 @@

<%- gettext( "You should change the name on your account to match your ID." ) %>

- > +