From 436a1ec7f62798eb2849aff1e775de0edf3aec38 Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Wed, 29 Jan 2014 16:00:31 -0500 Subject: [PATCH] downstairs fixxup on lms reverification --- lms/static/sass/multicourse/_dashboard.scss | 3 +- lms/static/sass/views/_verification.scss | 61 +++++++++++++++-- .../_dashboard_prompt_midcourse_reverify.html | 65 ++++++++++++++----- .../_dashboard_reverification_sidebar.html | 4 +- .../midcourse_photo_reverification.html | 4 +- ...midcourse_reverification_confirmation.html | 22 ++++--- .../midcourse_reverify_dash.html | 30 ++++----- 7 files changed, 138 insertions(+), 51 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 3170b1e468..eed092e81a 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -135,7 +135,8 @@ } .reverify-status-list { - padding: 0 0 0 9px; + padding: 0 0 0 ($baseline/2); + margin: ($baseline/4) 0; .status-item { @extend %t-copy-sub2; diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index 8163a58502..b88a162aa6 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -1842,7 +1842,7 @@ border: 1px solid $m-gray-t2; &.complete { - border: 1px solid $verified-color-lvl3; + border: 1px solid $success-color; .course-info { opacity: .5; @@ -1855,13 +1855,32 @@ .reverify-status { border-top: 1px solid $light-gray; background-color: $m-gray-l4; - color: $verified-color-lvl1; + color: $success-color; + font-weight: 600; + } + } + + &.pending { + border: 1px solid $warning-color; + + .course-info { + opacity: .5; + + .course-name { + font-weight: normal; + } + } + + .reverify-status { + border-top: 1px solid $light-gray; + background-color: $m-gray-l4; + color: $warning-color; font-weight: 600; } } &.failed { - border: 1px solid $error-red; + border: 1px solid $alert-color; .course-info { opacity: .5; @@ -1874,7 +1893,7 @@ .reverify-status { border-top: 1px solid $light-gray; background-color: $m-gray-l4; - color: $danger-red; + color: $alert-color; font-weight: 600; } } @@ -2208,10 +2227,44 @@ } } + &.step-confirmation { + .instruction { + display: inline-block; + width: flex-grid(8,12); + vertical-align: top; + } + .actions-next { + display: inline-block; + width: flex-grid(4,12); + vertical-align: top; + margin-top: $baseline; + } + .nav-item { + display: block; + margin: 0 0 $baseline 0; + text-align: center; + + &.conditional:after { + content: "or"; + display: block; + margin: $baseline 0; + } + } + + } } + + +//reverify notification special styles +.msg-reverify { + .reverify-list { + margin: 5px 0; + } +} + // ==================== // STATE: already verified diff --git a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html index c3cd7f87a8..1c437c8789 100644 --- a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html +++ b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html @@ -4,27 +4,58 @@ % if reverifications["must_reverify"]: -
-
-
-

${_("You need to re-verify to continue")}

- % for item in reverifications["must_reverify"]: -
-

- ${_('To continue in the verified track in {course_name}, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)} -

+ % if len(reverifications["must_reverify"]) > 1: + +
+
+
+

${_("You need to re-verify to continue")}

+
+

+ ${_("To continue in the verified track in the following courses, you need to re-verify your identity:")} +

+
    + % for item in reverifications["must_reverify"]: +
  • + ${_('{course_name}: Re-verify by {date}').format(course_name=item.course_name, date=item.date)} +
    • + % endfor +
+
+
-
-
-% endfor + + % elif reverifications["must_reverify"]: +
+
+
+

${_("You need to re-verify to continue")}

+ % for item in reverifications["must_reverify"]: +
+

+ ${_('To continue in the verified track in {course_name}, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)} +

+
+
+ +
+
+
+ % endfor + %endif %endif %if reverifications["denied"]: diff --git a/lms/templates/dashboard/_dashboard_reverification_sidebar.html b/lms/templates/dashboard/_dashboard_reverification_sidebar.html index b72ed8b28e..106ef50cf8 100644 --- a/lms/templates/dashboard/_dashboard_reverification_sidebar.html +++ b/lms/templates/dashboard/_dashboard_reverification_sidebar.html @@ -11,13 +11,13 @@ % if reverifications["must_reverify"]: % for item in reverifications["must_reverify"]: -
  • ${_('Re-verify now: {course_name}').format(course_name=item.course_name)}
    • +
  • ${_('Re-verify now: {course_name}').format(course_name=item.course_name)}
    • % endfor %endif % if reverifications["pending"]: % for item in reverifications["pending"]: -
  • ${_('Pending: {course_name}').format(course_name=item.course_name)}
    • +
  • ${_('Pending: {course_name}').format(course_name=item.course_name)}
    • % endfor %endif diff --git a/lms/templates/verify_student/midcourse_photo_reverification.html b/lms/templates/verify_student/midcourse_photo_reverification.html index 8361949e32..1d6e95e367 100644 --- a/lms/templates/verify_student/midcourse_photo_reverification.html +++ b/lms/templates/verify_student/midcourse_photo_reverification.html @@ -4,7 +4,7 @@ <%namespace name='static' file='/static_content.html'/> <%block name="bodyclass">midcourse-reverification-process is-not-verified step-photos register -<%block name="title">${_("Re-Verify | edX")} +<%block name="title">${_("Re-Verify")} <%block name="js_extra"> @@ -161,7 +161,7 @@

    Before proceeding, please review carefully

    -

    ${_("Once you verify your photo looks good and your name is correct, you can finish your re-verification and return to your course. You will not have another chance to re-verify.")}

    +

    ${_("Once you verify your photo looks good and your name is correct, you can finish your re-verification and return to your course. Note: You will not have another chance to re-verify.")}

    • diff --git a/lms/templates/verify_student/midcourse_reverification_confirmation.html b/lms/templates/verify_student/midcourse_reverification_confirmation.html index 31f6e76538..c8654d1ecc 100644 --- a/lms/templates/verify_student/midcourse_reverification_confirmation.html +++ b/lms/templates/verify_student/midcourse_reverification_confirmation.html @@ -7,10 +7,6 @@ <%block name="bodyclass">register verification-process is-not-verified step-confirmation <%block name="title">${_("Re-Verification Submission Confirmation")} -<%block name="js_extra"> - - - <%block name="content">
      @@ -25,14 +21,20 @@

      ${_("We have received your re-verification details and submitted them for review. Your dashboard will show the notification status once the review is complete.")}

      -

      ${_("The professor may ask you to re-verify again at other key points in the course.")}

      +

      ${_("Please note: The professor may ask you to re-verify again at other key points in the course.")}

      +
      + +
      +
        +
      1. + ${_("Complete your other re-verifications")} +
        2. +
      2. + ${_("Return to where you left off")} +
        3. +
      -
        -
      1. - ${_("Return to Your Dashboard")} -
        2. -
    diff --git a/lms/templates/verify_student/midcourse_reverify_dash.html b/lms/templates/verify_student/midcourse_reverify_dash.html index e7dacc4a10..8a63f16b9f 100644 --- a/lms/templates/verify_student/midcourse_reverify_dash.html +++ b/lms/templates/verify_student/midcourse_reverify_dash.html @@ -4,7 +4,7 @@ <%block name="bodyclass">midcourse-reverification-process step-dash register <%block name="title"> - ${_("Reverification Status | edX")} + ${_("Reverification Status")} @@ -14,14 +14,14 @@
    -

    You are in the Verified track

    +

    ${_("You are in the Verified track")}

    % if reverifications["must_reverify"]: % if len(reverifications["must_reverify"]) > 1:
    -

    You currently need to re-verify for the following courses:

    +

    ${_("You currently need to re-verify for the following courses:")}

      % for course_id, course_name, course_number, date, status in reverifications["must_reverify"]:
    • @@ -37,7 +37,7 @@ % elif reverifications["must_reverify"]:
      -

      You currently need to re-verify for the following course:

      +

      ${_("You currently need to re-verify for the following course:")}

        % for course_id, course_name, course_number, date, status in reverifications["must_reverify"]: @@ -55,7 +55,7 @@ % if reverifications["pending"] or reverifications["approved"] or reverifications["denied"]:
        -

        The status of your submitted re-verifications:

        +

        ${_("The status of your submitted re-verifications:")}

          % for course_id, course_name, course_number, date, status in reverifications["pending"]: @@ -64,7 +64,7 @@

          ${course_name} (${course_number})

          Re-verify by ${date}

        -

        Pending

        +

        ${_("Pending")}

        % endfor @@ -74,7 +74,7 @@

        ${course_name} (${course_number})

        Re-verify by ${date}

      -

      Complete

      +

      ${_("Complete")}

      • % endfor @@ -84,7 +84,7 @@

      ${course_name} (${course_number})

      Re-verify by ${date}

    -

    Failed

    +

    ${_("Failed")}

    % endfor @@ -93,7 +93,7 @@ % endif % else: -

    You have no re-verifications at present.

    +

    ${_("You have no re-verifications at present.")}

    % endif % if reverifications["must_reverify"]: @@ -105,25 +105,25 @@
    -

    Why do I need to re-verify?

    +

    ${_("Why do I need to re-verify?")}

    -

    At key points in a course, the professor will ask you to re-verify your identity by submitting a new photo of your face. We will send the new photo to be matched up with the photo of the original ID you submitted when you signed up for the course. If you are taking multiple courses, you may need to re-verify multiple times, once for every important point in each course you are taking as a verified student.

    +

    ${_("At key points in a course, the professor will ask you to re-verify your identity by submitting a new photo of your face. We will send the new photo to be matched up with the photo of the original ID you submitted when you signed up for the course. If you are taking multiple courses, you may need to re-verify multiple times, once for every important point in each course you are taking as a verified student.")}

    -

    What will I need to re-verify?

    +

    ${_("What will I need to re-verify?")}

    -

    Because you are just confirming that you are still you, the only thing you will need to do to re-verify is to submit a new photo of your face with your webcam. The process is quick and you will be brought back to where you left off so you can keep on learning.

    +

    ${_("Because you are just confirming that you are still you, the only thing you will need to do to re-verify is to submit a new photo of your face with your webcam. The process is quick and you will be brought back to where you left off so you can keep on learning.")}

    -

    If you changed your name during the semester and it no longer matches the original ID you submitted, you will need to re-edit your name to match as well.

    +

    ${_("If you changed your name during the semester and it no longer matches the original ID you submitted, you will need to re-edit your name to match as well.")}

    -

    What if I have trouble with my re-verification?

    +

    ${_("What if I have trouble with my re-verification?")}

    Because of the short time that re-verification is open, you will not be able to correct a failed verification. If you think there was an error in the review, please contact us at support@edx.org.