From ebd63b6188c4cd1cf45fb3dda48590af2b419751 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 27 Sep 2013 11:32:15 -0400 Subject: [PATCH 01/20] Add an upgrade parameter to the verification views. --- common/djangoapps/course_modes/views.py | 10 +++++++--- lms/djangoapps/verify_student/views.py | 10 +++++++++- lms/templates/verify_student/show_requirements.html | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py index e247ac08a2..84e6f65785 100644 --- a/common/djangoapps/course_modes/views.py +++ b/common/djangoapps/course_modes/views.py @@ -38,6 +38,8 @@ class ChooseModeView(View): return redirect(reverse('dashboard')) modes = CourseMode.modes_for_course_dict(course_id) + upgrade = request.GET.get('upgrade', False) + donation_for_course = request.session.get("donation_for_course", {}) chosen_price = donation_for_course.get(course_id, None) @@ -50,6 +52,7 @@ class ChooseModeView(View): "course_num": course.display_number_with_default, "chosen_price": chosen_price, "error": error, + "upgrade": upgrade, } if "verified" in modes: context["suggested_prices"] = [decimal.Decimal(x) for x in modes["verified"].suggested_prices.split(",")] @@ -70,6 +73,8 @@ class ChooseModeView(View): error_msg = _("Enrollment is closed") return self.get(request, course_id, error=error_msg) + upgrade = request.GET.get('upgrade', False) + requested_mode = self.get_requested_mode(request.POST.get("mode")) if requested_mode == "verified" and request.POST.get("honor-code"): requested_mode = "honor" @@ -106,13 +111,12 @@ class ChooseModeView(View): if SoftwareSecurePhotoVerification.user_has_valid_or_pending(request.user): return redirect( reverse('verify_student_verified', - kwargs={'course_id': course_id}) + kwargs={'course_id': course_id}) + "?upgrade={}".format(upgrade) ) return redirect( reverse('verify_student_show_requirements', - kwargs={'course_id': course_id}), - ) + kwargs={'course_id': course_id}) + "?upgrade={}".format(upgrade)) def get_requested_mode(self, user_choice): """ diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py index b220ff6a97..8fafc26834 100644 --- a/lms/djangoapps/verify_student/views.py +++ b/lms/djangoapps/verify_student/views.py @@ -44,12 +44,15 @@ class VerifyView(View): before proceeding to payment """ + upgrade = request.GET.get('upgrade', False) + # If the user has already been verified within the given time period, # redirect straight to the payment -- no need to verify again. if SoftwareSecurePhotoVerification.user_has_valid_or_pending(request.user): return redirect( reverse('verify_student_verified', - kwargs={'course_id': course_id})) + kwargs={'course_id': course_id}) + "?upgrade={}".format(upgrade) + ) elif CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified': return redirect(reverse('dashboard')) else: @@ -85,6 +88,7 @@ class VerifyView(View): "currency": verify_mode.currency.upper(), "chosen_price": chosen_price, "min_price": verify_mode.min_price, + "upgrade": upgrade, } return render_to_response('verify_student/photo_verification.html', context) @@ -100,6 +104,7 @@ class VerifiedView(View): """ Handle the case where we have a get request """ + upgrade = request.GET.get('upgrade', False) if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified': return redirect(reverse('dashboard')) verify_mode = CourseMode.mode_for_course(course_id, "verified") @@ -117,6 +122,7 @@ class VerifiedView(View): "purchase_endpoint": get_purchase_endpoint(), "currency": verify_mode.currency.upper(), "chosen_price": chosen_price, + "upgrade": upgrade, } return render_to_response('verify_student/verified.html', context) @@ -250,6 +256,7 @@ def show_requirements(request, course_id): if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified': return redirect(reverse('dashboard')) + upgrade = request.GET.get('upgrade', False) course = course_from_id(course_id) context = { "course_id": course_id, @@ -257,5 +264,6 @@ def show_requirements(request, course_id): "course_org": course.display_org_with_default, "course_num": course.display_number_with_default, "is_not_active": not request.user.is_active, + "upgrade": upgrade, } return render_to_response("verify_student/show_requirements.html", context) diff --git a/lms/templates/verify_student/show_requirements.html b/lms/templates/verify_student/show_requirements.html index 432a13fc62..4acd8b645a 100644 --- a/lms/templates/verify_student/show_requirements.html +++ b/lms/templates/verify_student/show_requirements.html @@ -153,7 +153,7 @@
  1. - +
From 56f6711252a2716da17209d3cc06cbea2c875e1a Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Tue, 8 Oct 2013 17:29:02 -0400 Subject: [PATCH 02/20] Add in new hooks for the dashboard into the upgrade path. --- common/djangoapps/course_modes/models.py | 14 ++++++++++---- .../course_modes/tests/test_models.py | 19 ++++++++++--------- common/djangoapps/student/views.py | 2 ++ lms/templates/dashboard.html | 3 ++- .../dashboard/dashboard_course_listing.html | 18 +++++++++++++++--- 5 files changed, 39 insertions(+), 17 deletions(-) diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py index ce15059643..8e475d1ec1 100644 --- a/common/djangoapps/course_modes/models.py +++ b/common/djangoapps/course_modes/models.py @@ -9,7 +9,7 @@ from collections import namedtuple from django.utils.translation import ugettext as _ from django.db.models import Q -Mode = namedtuple('Mode', ['slug', 'name', 'min_price', 'suggested_prices', 'currency']) +Mode = namedtuple('Mode', ['slug', 'name', 'min_price', 'suggested_prices', 'currency', 'expiration_date']) class CourseMode(models.Model): @@ -39,7 +39,7 @@ class CourseMode(models.Model): # turn this mode off after the given expiration date expiration_date = models.DateField(default=None, null=True, blank=True) - DEFAULT_MODE = Mode('honor', _('Honor Code Certificate'), 0, '', 'usd') + DEFAULT_MODE = Mode('honor', _('Honor Code Certificate'), 0, '', 'usd', None) DEFAULT_MODE_SLUG = 'honor' class Meta: @@ -57,8 +57,14 @@ class CourseMode(models.Model): found_course_modes = cls.objects.filter(Q(course_id=course_id) & (Q(expiration_date__isnull=True) | Q(expiration_date__gte=now))) - modes = ([Mode(mode.mode_slug, mode.mode_display_name, mode.min_price, mode.suggested_prices, mode.currency) - for mode in found_course_modes]) + modes = ([Mode( + mode.mode_slug, + mode.mode_display_name, + mode.min_price, + mode.suggested_prices, + mode.currency, + mode.expiration_date + ) for mode in found_course_modes]) if not modes: modes = [cls.DEFAULT_MODE] return modes diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py index 651c7c51a5..7a01c30dc4 100644 --- a/common/djangoapps/course_modes/tests/test_models.py +++ b/common/djangoapps/course_modes/tests/test_models.py @@ -49,7 +49,7 @@ class CourseModeModelTest(TestCase): self.create_mode('verified', 'Verified Certificate') modes = CourseMode.modes_for_course(self.course_id) - mode = Mode(u'verified', u'Verified Certificate', 0, '', 'usd') + mode = Mode(u'verified', u'Verified Certificate', 0, '', 'usd', None) self.assertEqual([mode], modes) modes_dict = CourseMode.modes_for_course_dict(self.course_id) @@ -61,8 +61,8 @@ class CourseModeModelTest(TestCase): """ Finding the modes when there's multiple modes """ - mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '', 'usd') - mode2 = Mode(u'verified', u'Verified Certificate', 0, '', 'usd') + mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '', 'usd', None) + mode2 = Mode(u'verified', u'Verified Certificate', 0, '', 'usd', None) set_modes = [mode1, mode2] for mode in set_modes: self.create_mode(mode.slug, mode.name, mode.min_price, mode.suggested_prices) @@ -81,9 +81,9 @@ class CourseModeModelTest(TestCase): self.assertEqual(0, CourseMode.min_course_price_for_currency(self.course_id, 'usd')) # create some modes - mode1 = Mode(u'honor', u'Honor Code Certificate', 10, '', 'usd') - mode2 = Mode(u'verified', u'Verified Certificate', 20, '', 'usd') - mode3 = Mode(u'honor', u'Honor Code Certificate', 80, '', 'cny') + mode1 = Mode(u'honor', u'Honor Code Certificate', 10, '', 'usd', None) + mode2 = Mode(u'verified', u'Verified Certificate', 20, '', 'usd', None) + mode3 = Mode(u'honor', u'Honor Code Certificate', 80, '', 'cny', None) set_modes = [mode1, mode2, mode3] for mode in set_modes: self.create_mode(mode.slug, mode.name, mode.min_price, mode.suggested_prices, mode.currency) @@ -98,14 +98,15 @@ class CourseModeModelTest(TestCase): modes = CourseMode.modes_for_course(self.course_id) self.assertEqual([CourseMode.DEFAULT_MODE], modes) - mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '', 'usd') + mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '', 'usd', None) self.create_mode(mode1.slug, mode1.name, mode1.min_price, mode1.suggested_prices) modes = CourseMode.modes_for_course(self.course_id) self.assertEqual([mode1], modes) - expired_mode.expiration_date = datetime.now(pytz.UTC) + timedelta(days=1) + expiration_date = datetime.now(pytz.UTC) + timedelta(days=1) + expired_mode.expiration_date = expiration_date expired_mode.save() - expired_mode_value = Mode(u'verified', u'Verified Certificate', 0, '', 'usd') + expired_mode_value = Mode(u'verified', u'Verified Certificate', 0, '', 'usd', expiration_date.date()) modes = CourseMode.modes_for_course(self.course_id) self.assertEqual([expired_mode_value, mode1], modes) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 9d3d0bc63b..3172026209 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -300,6 +300,7 @@ def dashboard(request): show_courseware_links_for = frozenset(course.id for course, _enrollment in courses if has_access(request.user, course, 'load')) + course_modes = {course.id: CourseMode.modes_for_course_dict(course.id) for course, _enrollment in courses} cert_statuses = {course.id: cert_info(request.user, course) for course, _enrollment in courses} # only show email settings for Mongo course and when bulk email is turned on @@ -324,6 +325,7 @@ def dashboard(request): 'staff_access': staff_access, 'errored_courses': errored_courses, 'show_courseware_links_for': show_courseware_links_for, + 'all_course_modes': course_modes, 'cert_statuses': cert_statuses, 'show_email_settings_for': show_email_settings_for, } diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 683422133f..1bcdd4582f 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -179,7 +179,8 @@ <% show_courseware_link = (course.id in show_courseware_links_for) %> <% cert_status = cert_statuses.get(course.id) %> <% show_email_settings = (course.id in show_email_settings_for) %> - <%include file='dashboard/dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings" /> + <% course_modes = all_course_modes.get(course.id) %> + <%include file='dashboard/dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_modes=course_modes" /> % endfor diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index 3442cb93aa..2f9069034a 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -1,8 +1,9 @@ -<%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings" /> +<%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings, course_modes" /> <%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse + from datetime import date from courseware.courses import course_image_url, get_course_about_section import waffle %> @@ -116,8 +117,6 @@ % endif % endif - - ${_('Unregister')} % if show_email_settings: @@ -125,5 +124,18 @@ % endif + %if enrollment.mode != 'verified' and 'verified' in course_modes: +
+ ${_("Get a verified certificate for this course!")} + %if course_modes['verified'].expiration_date: + <% days_left = (course_modes['verified'].expiration_date - date.today()).days %> +

+ ${_('Only {days} days left!').format(days=days_left)} +

+ %endif + +
+ %endif + From 349573dcdc99637c6868e3575d4a0f4096ef7747 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Wed, 9 Oct 2013 15:00:28 -0400 Subject: [PATCH 03/20] Add acceptance tests. --- .../courseware/features/certificates.feature | 11 +++++++++++ lms/djangoapps/courseware/features/certificates.py | 6 ++++++ lms/templates/dashboard/dashboard_course_listing.html | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature index 1b385b32e5..279ef019d6 100644 --- a/lms/djangoapps/courseware/features/certificates.feature +++ b/lms/djangoapps/courseware/features/certificates.feature @@ -70,3 +70,14 @@ Feature: LMS.Verified certificates And the course has an honor mode When I give a reason why I cannot pay Then I should see the course on my dashboard + + Scenario: The upsell offer is on the dashboard if I am auditing. + Given I am logged in + When I select the audit track + And I navigate to my dashboard + Then I see the upsell link on my dashboard + + Scenario: I can take the upsell offer and be registered for a verified course + Given I am logged in + And I select the audit track + And I navigate to my dashboard diff --git a/lms/djangoapps/courseware/features/certificates.py b/lms/djangoapps/courseware/features/certificates.py index b8a5b958b6..39c23e5cf8 100644 --- a/lms/djangoapps/courseware/features/certificates.py +++ b/lms/djangoapps/courseware/features/certificates.py @@ -221,6 +221,12 @@ def see_the_course_on_my_dashboard(step): assert world.is_css_present(course_link_css) +@step(u'I see the upsell link on my dashboard') +def see_upsell_link_on_my_dashboard(step): + course_link_css = 'div.verified-upsell a[href*="edx/999/Certificates"' + assert world.is_css_present(course_link_css) + + @step(u'I see that I am on the verified track') def see_that_i_am_on_the_verified_track(step): id_verified_css = 'li.course-item article.course.verified' diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index 2f9069034a..fb78980da3 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -125,7 +125,7 @@ %if enrollment.mode != 'verified' and 'verified' in course_modes: -
+
${_("Get a verified certificate for this course!")} %if course_modes['verified'].expiration_date: <% days_left = (course_modes['verified'].expiration_date - date.today()).days %> From c42bff6528f26043b224c56285b2302a5a5596ca Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 9 Oct 2013 17:14:09 -0400 Subject: [PATCH 04/20] LMS: preps track selection view for upgrade cases --- common/templates/course_modes/choose.html | 45 ++++---- lms/static/sass/views/_verification.scss | 102 +++++++++++++++++- .../verify_student/_verification_header.html | 6 +- .../verify_student/_verification_support.html | 2 +- 4 files changed, 132 insertions(+), 23 deletions(-) diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html index 738728042b..5aa65a04d7 100644 --- a/common/templates/course_modes/choose.html +++ b/common/templates/course_modes/choose.html @@ -2,7 +2,7 @@ <%! from django.core.urlresolvers import reverse %> <%inherit file="../main.html" /> -<%block name="bodyclass">register verification-process step-select-track +<%block name="bodyclass">register verification-process step-select-track ${'is-upgrading' if upgrade else ''} <%block name="title">${_("Register for {} | Choose Your Track").format(course_name)} <%block name="js_extra"> @@ -48,7 +48,10 @@ $(document).ready(function() {
+ + %if not upgrade:

${_("Select your track:")}

+ %endif
@@ -133,25 +136,29 @@ $(document).ready(function() {
% endif - % if "audit" in modes: - - ${_("or")} - -
-
-

${_("Audit This Course")}

-
-

${_("Sign up to audit this course for free and track your own progress.")}

-
-
+ %if not upgrade: -
    -
  • - -
    • -
-
- % endif + % if "audit" in modes: + + ${_("or")} + +
+
+

${_("Audit This Course")}

+
+

${_("Sign up to audit this course for free and track your own progress.")}

+
+
+ +
    +
  • + +
    • +
+
+ % endif + + %endif diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index 589c45f7d3..ece257b7ee 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -1,6 +1,95 @@ // lms - views - verification flow // ==================== +// MISC: extends - type +// application: canned headings +%hd-lv1 { + @extend %t-title1; + @extend %t-weight1; + color: $m-gray-d4; + margin: 0 0 ($baseline*2) 0; +} + +%hd-lv2 { + @extend %t-title4; + @extend %t-weight1; + margin: 0 0 ($baseline*0.75) 0; + border-bottom: 1px solid $m-gray-l4; + padding-bottom: ($baseline/2); + color: $m-gray-d4; +} + +%hd-lv3 { + @extend %t-title6; + @extend %t-weight4; + margin: 0 0 ($baseline/4) 0; + color: $m-gray-d4; +} + +%hd-lv4 { + @extend %t-title6; + @extend %t-weight2; + margin: 0 0 $baseline 0; + color: $m-gray-d4; +} + +%hd-lv5 { + @extend %t-title7; + @extend %t-weight4; + margin: 0 0 ($baseline/4) 0; + color: $m-gray-d4; +} + +// application: canned copy +%copy-base { + @extend %t-copy-base; + color: $m-gray-d2; +} + +%copy-lead1 { + @extend %t-copy-lead2; + color: $m-gray; +} + +%copy-detail { + @extend %t-copy-sub1; + @extend %t-weight3; + color: $m-gray-d1; +} + +%copy-metadata { + @extend %t-copy-sub2; + color: $m-gray-d1; + + + %copy-metadata-value { + @extend %t-weight2; + } + + %copy-metadata-value { + @extend %t-weight4; + } +} + +// application: canned links +%copy-link { + border-bottom: 1px dotted transparent; + + &:hover, &:active { + border-color: $link-color-d1; + } +} + +%copy-badge { + @extend %t-title8; + @extend %t-weight5; + border-radius: ($baseline/5); + padding: ($baseline/2) $baseline; + text-transform: uppercase; +} + +// ==================== + // MISC: extends - button %btn-verify-primary { @extend %btn-primary-green; @@ -72,7 +161,7 @@ // ==================== // VIEW: all verification steps -.register.verification-process { +.verification-process { // reset: box-sizing (making things so right its scary) * { @@ -388,11 +477,12 @@ .sts-label { @extend %t-title7; + @extend %t-weight4; display: block; margin-bottom: ($baseline/2); border-bottom: ($baseline/10) solid $m-gray-l4; padding-bottom: ($baseline/2); - color: $m-gray; + color: $m-gray-d1; } .sts-course { @@ -1816,3 +1906,11 @@ width: 32% !important; } } + +// STATE: upgrading registration type +.register.is-upgrading { + + .form-register-choose { + margin-top: ($baseline*2); + } +} diff --git a/lms/templates/verify_student/_verification_header.html b/lms/templates/verify_student/_verification_header.html index 4870a59c49..0f4878221d 100644 --- a/lms/templates/verify_student/_verification_header.html +++ b/lms/templates/verify_student/_verification_header.html @@ -2,7 +2,11 @@

- ${_("You are registering for")} + %if upgrade: + ${_("You are upgrading your registration for")} + %else: + ${_("You are registering for")} + %endif diff --git a/lms/templates/verify_student/_verification_support.html b/lms/templates/verify_student/_verification_support.html index 0503c3bf7d..5e4940140c 100644 --- a/lms/templates/verify_student/_verification_support.html +++ b/lms/templates/verify_student/_verification_support.html @@ -18,7 +18,7 @@
  • -

    ${_("Having Technical Trouble?")}

    +

    ${_("Technical Requirements")}

    ${_("Please make sure your browser is updated to the {strong_start}{a_start}most recent version possible{a_end}{strong_end}. Also, please make sure your {strong_start}web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).{strong_end}").format(a_start='', a_end="", strong_start="", strong_end="")}

    From c1ab324d33072e157f950d8fa5eae72a29d19ecc Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 9 Oct 2013 17:14:09 -0400 Subject: [PATCH 05/20] LMS: preps track selection view for upgrade cases --- lms/static/sass/views/_verification.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index ece257b7ee..83c68558a4 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -1911,6 +1911,6 @@ .register.is-upgrading { .form-register-choose { - margin-top: ($baseline*2); + margin-top: ($baseline*2) !important; } } From 19c21d2023e4346cb3d3143048307c3fb8e4756b Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Thu, 17 Oct 2013 16:47:06 +0000 Subject: [PATCH 06/20] Fixed LMS-1062 --- common/djangoapps/course_modes/views.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py index 84e6f65785..c4dd41b61e 100644 --- a/common/djangoapps/course_modes/views.py +++ b/common/djangoapps/course_modes/views.py @@ -34,12 +34,19 @@ class ChooseModeView(View): @method_decorator(login_required) def get(self, request, course_id, error=None): """ Displays the course mode choice page """ - if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified': - return redirect(reverse('dashboard')) - modes = CourseMode.modes_for_course_dict(course_id) - + + enrollment_mode = CourseEnrollment.enrollment_mode_for_user(request.user, course_id) upgrade = request.GET.get('upgrade', False) + # verified users do not need to register or upgrade + if enrollment_mode == 'verified': + return redirect(reverse('dashboard')) + + # registered users who are not trying to upgrade do not need to re-register + if enrollment_mode != None and upgrade == False: + return redirect(reverse('dashboard')) + + modes = CourseMode.modes_for_course_dict(course_id) donation_for_course = request.session.get("donation_for_course", {}) chosen_price = donation_for_course.get(course_id, None) From 607deb0114737c5014966c84b06a27b822a30a70 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 17 Oct 2013 13:07:47 -0400 Subject: [PATCH 07/20] Add new acceptance test for complete upgrade flow --- .../courseware/features/certificates.feature | 13 +++++- .../courseware/features/certificates.py | 45 +++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature index 279ef019d6..16eca8aabd 100644 --- a/lms/djangoapps/courseware/features/certificates.feature +++ b/lms/djangoapps/courseware/features/certificates.feature @@ -35,6 +35,7 @@ Feature: LMS.Verified certificates And I navigate to my dashboard Then I see the course on my dashboard And I see that I am on the verified track + And I do not see the upsell link on my dashboard # Not easily automated # Scenario: I can re-take photos @@ -77,7 +78,17 @@ Feature: LMS.Verified certificates And I navigate to my dashboard Then I see the upsell link on my dashboard - Scenario: I can take the upsell offer and be registered for a verified course + Scenario: I can take the upsell offer and pay for it Given I am logged in And I select the audit track And I navigate to my dashboard + When I see the upsell link on my dashboard + And I select the upsell link on my dashboard + And I select the verified track for upgrade + And I submit my photos and confirm + And I am at the payment page + And I submit valid payment information + And I navigate to my dashboard + Then I see the course on my dashboard + And I see that I am on the verified track + diff --git a/lms/djangoapps/courseware/features/certificates.py b/lms/djangoapps/courseware/features/certificates.py index 39c23e5cf8..beffdecbda 100644 --- a/lms/djangoapps/courseware/features/certificates.py +++ b/lms/djangoapps/courseware/features/certificates.py @@ -53,7 +53,7 @@ def the_course_has_an_honor_mode(step): mode_slug='honor', mode_display_name='honor mode', min_price=0, - ) + ) assert isinstance(honor_mode, CourseMode) @@ -73,14 +73,26 @@ def select_contribution(amount=32): assert world.css_find(radio_css).selected +def click_verified_track_button(): + world.wait_for_ajax_complete() + btn_css = 'input[value="Select Certificate"]' + world.css_click(btn_css) + + +@step(u'I select the verified track for upgrade') +def select_verified_track_upgrade(step): + select_contribution(32) + click_verified_track_button() + # TODO: might want to change this depending on the changes for upgrade + assert world.is_css_present('section.progress') + + @step(u'I select the verified track$') def select_the_verified_track(step): create_cert_course() register() select_contribution(32) - world.wait_for_ajax_complete() - btn_css = 'input[value="Select Certificate"]' - world.css_click(btn_css) + click_verified_track_button() assert world.is_css_present('section.progress') @@ -203,6 +215,20 @@ def submitted_photos_to_verify_my_identity(step): step.given('I go to step "4"') +@step(u'I submit my photos and confirm') +def submit_photos_and_confirm(step): + step.given('I go to step "1"') + step.given('I capture my "face" photo') + step.given('I approve my "face" photo') + step.given('I go to step "2"') + step.given('I capture my "photo_id" photo') + step.given('I approve my "photo_id" photo') + step.given('I go to step "3"') + step.given('I select a contribution amount') + step.given('I confirm that the details match') + step.given('I go to step "4"') + + @step(u'I see that my payment was successful') def see_that_my_payment_was_successful(step): title = world.css_find('div.wrapper-content-main h3.title') @@ -227,6 +253,17 @@ def see_upsell_link_on_my_dashboard(step): assert world.is_css_present(course_link_css) +@step(u'I do not see the upsell link on my dashboard') +def see_upsell_link_on_my_dashboard(step): + course_link_css = 'div.verified-upsell a[href*="edx/999/Certificates"' + assert not world.is_css_present(course_link_css) + + +@step(u'I select the upsell link on my dashboard') +def see_upsell_link_on_my_dashboard(step): + world.css_click('div.verified-upsell a[href*="edx/999/Certificates"') + + @step(u'I see that I am on the verified track') def see_that_i_am_on_the_verified_track(step): id_verified_css = 'li.course-item article.course.verified' From 7a1a69b96a07eb61320e561ae8c9d8ea1d8bc5bc Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 22 Oct 2013 16:25:54 -0400 Subject: [PATCH 08/20] LMS: revises styling/placement of message for verified status on dashboard --- lms/static/sass/multicourse/_dashboard.scss | 20 +++++++++---------- lms/static/sass/views/_verification.scss | 3 ++- .../dashboard/dashboard_course_listing.html | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index ad8919f69a..e11b817fcf 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -419,22 +419,22 @@ // STATE: course mode - verified &.verified { @extend %ui-depth2; - margin-top: ($baseline*2.5); - border-top: 1px solid $verified-color-lvl3; - padding-top: ($baseline*1.25); - background: $white; + position: relative; - // FIXME: bad, but needed selector! - .info > hgroup .date-block { - top: ($baseline*1.25); + .cover { + border-radius: ($baseline/10); + border: 1px solid $verified-color-lvl3; + border-bottom: 4px solid $verified-color-lvl3; + padding: ($baseline/10); } // course enrollment status message .sts-enrollment { display: inline-block; position: absolute; - top: -28px; - right: ($baseline/2); + top: 105px; + left: 55px; + bottom: ($baseline/2); text-align: center; .label { @@ -454,8 +454,8 @@ @extend %copy-badge; border-radius: 0; padding: ($baseline/4) ($baseline/2) ($baseline/4) $baseline; - color: $white; background: $verified-color-lvl3; + color: $white; } } } diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index 83c68558a4..32cec3537d 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -82,10 +82,11 @@ %copy-badge { @extend %t-title8; - @extend %t-weight5; + @extend %t-weight4; border-radius: ($baseline/5); padding: ($baseline/2) $baseline; text-transform: uppercase; + letter-spacing: 0.1rem; } // ==================== diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index fb78980da3..67ff07855f 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -30,11 +30,11 @@ % endif % if enrollment.mode == "verified": - - ${_("Enrolled as: ")} - ID Verified Ribbon/Badge - ${_("ID Verified")} - + + ${_("Enrolled as: ")} + ID Verified Ribbon/Badge + ${_("ID Verified")} + % endif
    From baa73f0a1ed74f90fd6fe46c77184689e5c2ebb1 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 23 Oct 2013 22:17:05 -0400 Subject: [PATCH 09/20] LMS: adds in UI and styling for verified track upgrade to dashboard view --- lms/static/sass/base/_extends.scss | 13 ++ lms/static/sass/multicourse/_dashboard.scss | 116 ++++++++++++++---- .../dashboard/dashboard_course_listing.html | 44 ++++--- 3 files changed, 137 insertions(+), 36 deletions(-) diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss index ebd5ae806e..abfdaa0d5c 100644 --- a/lms/static/sass/base/_extends.scss +++ b/lms/static/sass/base/_extends.scss @@ -100,3 +100,16 @@ // outline: thin dotted !important; } } + +// removes list styling/spacing when using uls, ols for navigation and less content-centric cases +%ui-no-list { + list-style: none; + margin: 0; + padding: 0; + text-indent: 0; + + li { + margin: 0; + padding: 0; + } +} diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index e11b817fcf..4bc592f77b 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -227,6 +227,8 @@ } } + // ==================== + // course listings .my-courses { float: left; @@ -272,6 +274,8 @@ } } + // ==================== + // UI: course list .listing-courses { @extend %ui-no-list; @@ -289,6 +293,8 @@ } } + // ==================== + // UI: individual course item .course { @include box-sizing(box); @@ -416,6 +422,8 @@ } } + // ==================== + // STATE: course mode - verified &.verified { @extend %ui-depth2; @@ -459,41 +467,112 @@ } } } - } - .message-status { + // ==================== + + // UI: message + .message { @include clearfix; border-radius: 3px; display: none; z-index: 10; - margin: 20px 0 10px; - padding: 15px 20px; + margin: $baseline 0 ($baseline/2) 0; + padding: ($baseline*0.75) $baseline; font-family: $sans-serif; background: tint($yellow,70%); border: 1px solid #ccc; + // STATE: shown + &.is-shown { + display: block; + } + + a { + font-family: $sans-serif; + } + + strong { + font-weight: 700; + + a { + font-weight: 700; + } + } + + .message-title, + .message-copy .title { + @extend %t-title5; + @extend %t-weight4; + margin-bottom: ($baseline/4); + } + + .message-copy, + .message-copy .copy { + @extend %t-copy-sub1; + margin: 0; + } + + // CASE: has actions + &.has-actions { + @include clearfix(); + + .message-copy { + float: left; + width: 50%; + margin-right: 5%; + } + + .message-actions { + @extend %ui-no-list; + float: right; + width: 40%; + text-align: right; + } + } + } + + // TYPE: upsell + .message-upsell { + background: $verified-color-lvl5; + + .action-upgrade { + @extend %btn-verify-primary; + @include clearfix(); + + span { + color: $white; // nasty but needed override for poor styling + } + + .copy { + @extend %t-action3; + @extend %t-weight4; + display: block; + margin-bottom: ($baseline/4); + } + + .copy-sub { + @extend %t-action4; + display: block; + opacity: 0.875; + } + } + } + + // TYPE: status + .message-status { + background: tint($yellow,70%); + border-color: #ccc; + .message-copy { font-family: $sans-serif; font-size: 13px; margin: 0; - a { - font-family: $sans-serif; - } - .grade-value { font-size: 1.2rem; font-weight: bold; } - - strong { - font-weight: 700; - - a { - font-weight: 700; - } - } } .actions { @@ -589,10 +668,6 @@ } } - &.is-shown { - display: block; - } - &.course-status-processing { } @@ -614,7 +689,6 @@ } } - a.unenroll { float: right; display: block; diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index 67ff07855f..f375ee88b1 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -96,12 +96,12 @@
  • - Download Your PDF Certificate
    • + ${_("Download Your PDF Certificate")}
    • % endif % if cert_status['show_survey_button']:
  • - ${_('Complete our course feedback survey')}
    • + ${_("Complete our course feedback survey")} % endif % endif @@ -109,6 +109,33 @@ % endif + %if enrollment.mode != 'verified' and 'verified' in course_modes: +
    + +
    +

    ${_("Challenge Yourself!")}

    +

    ${_("Register for the {a_start} verified certificate {a_end} track").format(a_start='', a_end="")}

    +
    + + +
    + %endif + % if show_courseware_link: % if course.has_ended(): ${_('View Archived Course')} @@ -124,18 +151,5 @@ % endif - %if enrollment.mode != 'verified' and 'verified' in course_modes: -
    - ${_("Get a verified certificate for this course!")} - %if course_modes['verified'].expiration_date: - <% days_left = (course_modes['verified'].expiration_date - date.today()).days %> -

    - ${_('Only {days} days left!').format(days=days_left)} -

    - %endif - -
    - %endif - From aae13c584b085aa11f97816b105e8b2d746a0788 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 25 Oct 2013 14:21:00 -0400 Subject: [PATCH 10/20] Move more logic into the views Also includes some tests Story: LMS-1127 --- common/djangoapps/student/tests/factories.py | 11 +++++ common/djangoapps/student/tests/tests.py | 45 ++++++++++++++++++- common/djangoapps/student/views.py | 25 ++++++++++- lms/templates/dashboard.html | 4 +- .../dashboard/dashboard_course_listing.html | 13 +++--- 5 files changed, 85 insertions(+), 13 deletions(-) diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py index b2f4d95776..107631b17b 100644 --- a/common/djangoapps/student/tests/factories.py +++ b/common/djangoapps/student/tests/factories.py @@ -2,6 +2,7 @@ from student.models import (User, UserProfile, Registration, CourseEnrollmentAllowed, CourseEnrollment, PendingEmailChange, UserStanding, ) +from course_modes.models import CourseMode from django.contrib.auth.models import Group from datetime import datetime from factory import DjangoModelFactory, SubFactory, PostGenerationMethodCall, post_generation, Sequence @@ -36,6 +37,16 @@ class UserProfileFactory(DjangoModelFactory): goals = u'World domination' +class CourseModeFactory(DjangoModelFactory): + FACTORY_FOR = CourseMode + + course_id = None + mode_display_name = u'Honor Code', + mode_slug = 'honor' + min_price = 0 + suggested_prices = '' + currency = 'usd' + class RegistrationFactory(DjangoModelFactory): FACTORY_FOR = Registration diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py index c35ad66427..b53df0bfd8 100644 --- a/common/djangoapps/student/tests/tests.py +++ b/common/djangoapps/student/tests/tests.py @@ -8,6 +8,8 @@ import logging import json import re import unittest +from datetime import datetime, timedelta +import pytz from django.conf import settings from django.test import TestCase @@ -28,8 +30,8 @@ from textwrap import dedent from student.models import unique_id_for_user, CourseEnrollment from student.views import (process_survey_link, _cert_info, password_reset, password_reset_confirm_wrapper, - change_enrollment) -from student.tests.factories import UserFactory + change_enrollment, complete_course_mode_info) +from student.tests.factories import UserFactory, CourseModeFactory from student.tests.test_email import mock_render_to_string import shoppingcart @@ -216,6 +218,45 @@ class CourseEndingTest(TestCase): }) +@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE) +class DashboardTest(TestCase): + """ + Tests for dashboard utility functions + """ + # arbitrary constant + COURSE_SLUG = "100" + COURSE_NAME = "test_course" + COURSE_ORG = "EDX" + + def setUp(self): + self.course = CourseFactory.create(org=self.COURSE_ORG, display_name=self.COURSE_NAME, number=self.COURSE_SLUG) + self.assertIsNotNone(self.course) + self.user = UserFactory.create(username="jack", email="jack@fake.edx.org") + CourseModeFactory.create( + course_id=self.course.id, + mode_slug='honor', + mode_display_name='Honor Code', + ) + + def test_course_mode_info(self): + verified_mode = CourseModeFactory.create( + course_id=self.course.id, + mode_slug='verified', + mode_display_name='Verified', + expiration_date=datetime.now(pytz.UTC) + timedelta(days=1) + ) + enrollment = CourseEnrollment.enroll(self.user, self.course.id) + course_mode_info = complete_course_mode_info(self.course.id, enrollment) + self.assertTrue(course_mode_info['show_upsell']) + self.assertEquals(course_mode_info['days_for_upsell'], 1) + + verified_mode.expiration_date = datetime.now(pytz.UTC) + timedelta(days=-1) + verified_mode.save() + course_mode_info = complete_course_mode_info(self.course.id, enrollment) + self.assertFalse(course_mode_info['show_upsell']) + self.assertIsNone(course_mode_info['days_for_upsell']) + + class EnrollInCourseTest(TestCase): """Tests enrolling and unenrolling in courses.""" diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 3172026209..4ebbcff592 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -267,6 +267,29 @@ def register_user(request, extra_context=None): return render_to_response('register.html', context) +def complete_course_mode_info(course_id, enrollment): + """ + We would like to compute some more information from the given course modes + and the user's current enrollment + + Returns the given information: + - whether to show the course upsell information + - numbers of days until they can't upsell anymore + """ + modes = CourseMode.modes_for_course_dict(course_id) + mode_info = {'show_upsell': False, 'days_for_upsell': None} + # we want to know if the user is already verified and if verified is an + # option + if 'verified' in modes and enrollment.mode != 'verified': + mode_info['show_upsell'] = True + # if there is an expiration date, find out how long from now it is + if modes['verified'].expiration_date: + today = datetime.datetime.now(UTC).date() + mode_info['days_for_upsell'] = (modes['verified'].expiration_date - today).days + + return mode_info + + @login_required @ensure_csrf_cookie def dashboard(request): @@ -300,7 +323,7 @@ def dashboard(request): show_courseware_links_for = frozenset(course.id for course, _enrollment in courses if has_access(request.user, course, 'load')) - course_modes = {course.id: CourseMode.modes_for_course_dict(course.id) for course, _enrollment in courses} + course_modes = {course.id: complete_course_mode_info(course.id, enrollment) for course, enrollment in courses} cert_statuses = {course.id: cert_info(request.user, course) for course, _enrollment in courses} # only show email settings for Mongo course and when bulk email is turned on diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 1bcdd4582f..6b9981ced5 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -179,8 +179,8 @@ <% show_courseware_link = (course.id in show_courseware_links_for) %> <% cert_status = cert_statuses.get(course.id) %> <% show_email_settings = (course.id in show_email_settings_for) %> - <% course_modes = all_course_modes.get(course.id) %> - <%include file='dashboard/dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_modes=course_modes" /> + <% course_mode_info = all_course_modes.get(course.id) %> + <%include file='dashboard/dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info" /> % endfor diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index f375ee88b1..c8a527391e 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -1,9 +1,8 @@ -<%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings, course_modes" /> +<%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings, course_mode_info" /> <%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse - from datetime import date from courseware.courses import course_image_url, get_course_about_section import waffle %> @@ -109,12 +108,11 @@ % endif - %if enrollment.mode != 'verified' and 'verified' in course_modes: + %if course_mode_info['show_upsell']:
    -

    ${_("Challenge Yourself!")}

    -

    ${_("Register for the {a_start} verified certificate {a_end} track").format(a_start='', a_end="")}

    +

    ${_("Register for the {a_start} verified certificate {a_end} track").format(a_start=''.format(marketing_link('WHAT_IS_VERIFIED_CERT')), a_end="")}

      @@ -123,10 +121,9 @@ ${_("Upgrade to Verified Track")} - %if course_modes['verified'].expiration_date: - <% days_left = (course_modes['verified'].expiration_date - date.today()).days %> + %if course_mode_info['days_for_upsell']: - ${_('{days} days left!').format(days=days_left)} + ${_('{days} days left!').format(days=course_mode_info['days_for_upsell'])} %endif From c13d965f8eb6e73d7bb9e7e709bd36e67ff28cfc Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 25 Oct 2013 15:20:09 -0400 Subject: [PATCH 11/20] Fix up acceptance tests for upsell. LMS-1127 --- lms/djangoapps/courseware/features/certificates.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/courseware/features/certificates.py b/lms/djangoapps/courseware/features/certificates.py index beffdecbda..4a30e7519b 100644 --- a/lms/djangoapps/courseware/features/certificates.py +++ b/lms/djangoapps/courseware/features/certificates.py @@ -6,6 +6,8 @@ from lettuce.django import django_url from course_modes.models import CourseMode from nose.tools import assert_equal +UPSELL_LINK_CSS = '.message-upsell a.action-upgrade[href*="edx/999/Certificates"]' + def create_cert_course(): world.clear_courses() org = 'edx' @@ -249,19 +251,20 @@ def see_the_course_on_my_dashboard(step): @step(u'I see the upsell link on my dashboard') def see_upsell_link_on_my_dashboard(step): - course_link_css = 'div.verified-upsell a[href*="edx/999/Certificates"' + course_link_css = UPSELL_LINK_CSS assert world.is_css_present(course_link_css) @step(u'I do not see the upsell link on my dashboard') def see_upsell_link_on_my_dashboard(step): - course_link_css = 'div.verified-upsell a[href*="edx/999/Certificates"' + course_link_css = UPSELL_LINK_CSS assert not world.is_css_present(course_link_css) @step(u'I select the upsell link on my dashboard') def see_upsell_link_on_my_dashboard(step): - world.css_click('div.verified-upsell a[href*="edx/999/Certificates"') + course_link_css = UPSELL_LINK_CSS + world.css_click(course_link_css) @step(u'I see that I am on the verified track') From ae6ec926721a5e24ea03719e01e74321c88ed0e2 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Sat, 26 Oct 2013 23:09:09 -0400 Subject: [PATCH 12/20] LMS: resolves styling issues for button UI in verification flows --- lms/static/sass/multicourse/_dashboard.scss | 2 +- lms/static/sass/views/_verification.scss | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 4bc592f77b..1e284c7b1c 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -537,7 +537,7 @@ background: $verified-color-lvl5; .action-upgrade { - @extend %btn-verify-primary; + @extend %btn-primary-green; @include clearfix(); span { diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index 32cec3537d..56cf35d0ea 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -269,12 +269,16 @@ // elements - controls .action-primary { @extend %btn-primary-blue; - border: none; + // needed for override due to .register a:link styling + border: 0 !important; + color: $white !important; } .action-confirm { @extend %btn-verify-primary; - border: none; + // needed for override due to .register a:link styling + border: 0 !important; + color: $white !important; } // ==================== From e50397002f7bf3fd37933565ccdb88487b34d433 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Mon, 28 Oct 2013 14:39:46 -0400 Subject: [PATCH 13/20] Better handling of the expiration date. LMS-1127 --- common/djangoapps/student/tests/tests.py | 2 +- lms/templates/dashboard/dashboard_course_listing.html | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py index b53df0bfd8..315b6e9285 100644 --- a/common/djangoapps/student/tests/tests.py +++ b/common/djangoapps/student/tests/tests.py @@ -243,7 +243,7 @@ class DashboardTest(TestCase): course_id=self.course.id, mode_slug='verified', mode_display_name='Verified', - expiration_date=datetime.now(pytz.UTC) + timedelta(days=1) + expiration_date=(datetime.now(pytz.UTC) + timedelta(days=1)).date() ) enrollment = CourseEnrollment.enroll(self.user, self.course.id) course_mode_info = complete_course_mode_info(self.course.id, enrollment) diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/dashboard_course_listing.html index c8a527391e..dd83347275 100644 --- a/lms/templates/dashboard/dashboard_course_listing.html +++ b/lms/templates/dashboard/dashboard_course_listing.html @@ -120,12 +120,6 @@ ${_("Upgrade to Verified Track")} - - %if course_mode_info['days_for_upsell']: - - ${_('{days} days left!').format(days=course_mode_info['days_for_upsell'])} - - %endif From 8442f6e09320233e4b168000247904d0cecf425f Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 28 Oct 2013 13:42:30 -0400 Subject: [PATCH 14/20] LMS: adds conditional content/instructions for registration upgrade flow --- common/templates/course_modes/choose.html | 43 +++++++++++++++---- lms/static/sass/elements/_typography.scss | 1 + lms/static/sass/views/_verification.scss | 10 +---- .../verify_student/_verification_header.html | 6 ++- .../verify_student/_verification_support.html | 15 +++++-- .../verify_student/photo_verification.html | 19 ++++++-- .../verify_student/show_requirements.html | 35 ++++++++++++--- 7 files changed, 97 insertions(+), 32 deletions(-) diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html index 5aa65a04d7..67cc0a301d 100644 --- a/common/templates/course_modes/choose.html +++ b/common/templates/course_modes/choose.html @@ -3,7 +3,15 @@ <%inherit file="../main.html" /> <%block name="bodyclass">register verification-process step-select-track ${'is-upgrading' if upgrade else ''} -<%block name="title">${_("Register for {} | Choose Your Track").format(course_name)} +<%block name="title"> + + %if upgrade: + ${_("Upgrade Your Registration for {} | Choose Your Track").format(course_name)} + %else: + ${_("Register for {} | Choose Your Track").format(course_name)} + %endif + + <%block name="js_extra"> @@ -172,7 +180,12 @@
      ${_("What do you do with this picture?")}
      ${_("We only use it to verify your identity. It is not displayed anywhere.")}
      ${_("What if my camera isn't working?")}
      -
      ${_("You can always {a_start} audit the course for free {a_end} without verifying.").format(a_start='', a_end="")}
      + + %if upgrade: +
      ${_("You can always continue to audit the course without verifying.")}
      + %else: +
      ${_("You can always {a_start} audit the course for free {a_end} without verifying.").format(a_start='', a_end="")}
      + %endif

    diff --git a/lms/templates/verify_student/show_requirements.html b/lms/templates/verify_student/show_requirements.html index 4acd8b645a..3280fec89a 100644 --- a/lms/templates/verify_student/show_requirements.html +++ b/lms/templates/verify_student/show_requirements.html @@ -1,8 +1,16 @@ <%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse %> <%inherit file="../main.html" /> -<%block name="bodyclass">register verification-process step-requirements -<%block name="title">${_("Register for {}").format(course_name)} +<%block name="bodyclass">register verification-process step-requirements ${'is-upgrading' if upgrade else ''} +<%block name="title"> + + %if upgrade: + ${_("Upgrade Your Registration for {}").format(course_name)} + %else: + ${_("Register for {}").format(course_name)} + %endif + + <%block name="content"> %if is_not_active: @@ -71,11 +79,19 @@
    -

    ${_("What You Will Need to Register")}

    + %if upgrade: +

    ${_("What You Will Need to Upgrade")}

    -
    -

    ${_("There are three things you will need to register as an ID verified student:")}

    -
    +
    +

    ${_("There are three things you will need to upgrade to being an ID verified student:")}

    +
    + %else: +

    ${_("What You Will Need to Register")}

    + +
    +

    ${_("There are three things you will need to register as an ID verified student:")}

    +
    + %endif
      %if is_not_active: @@ -149,7 +165,12 @@