Commit 436a1ec7 by Frances Botsford Committed by Julia Hansbrough

downstairs fixxup on lms reverification

parent 3aa80654
......@@ -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;
......
......@@ -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
......
......@@ -4,27 +4,58 @@
<!--TODO replace this with a shiny loopy thing to actually print out all courses-->
% if reverifications["must_reverify"]:
<div class="wrapper-msg urgency-high">
<div class="msg msg-reverify has-actions">
<div class="msg-content">
<h2 class="title">${_("You need to re-verify to continue")}</h2>
% for item in reverifications["must_reverify"]:
<div class="copy">
<p class='activation-message'>
${_('To continue in the verified track in <strong>{course_name}</strong>, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)}
</p>
% if len(reverifications["must_reverify"]) > 1:
<div class="wrapper-msg urgency-high">
<div class="msg msg-reverify has-actions">
<div class="msg-content">
<h2 class="title">${_("You need to re-verify to continue")}</h2>
<div class="copy">
<p class="activation-message">
${_("To continue in the verified track in the following courses, you need to re-verify your identity:")}
</p>
<ul class="reverify-list">
% for item in reverifications["must_reverify"]:
<li class="item">
${_('<strong>{course_name}</strong>: Re-verify by {date}').format(course_name=item.course_name, date=item.date)}
</li>
% endfor
</ul>
</div>
</div>
<nav class="nav-actions">
<h3 class="sr">Notification Actions</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div>
<nav class="nav-actions">
<h3 class="sr">Notification Actions</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div>
</div>
</div>
% endfor
% elif reverifications["must_reverify"]:
<div class="wrapper-msg urgency-high">
<div class="msg msg-reverify has-actions">
<div class="msg-content">
<h2 class="title">${_("You need to re-verify to continue")}</h2>
% for item in reverifications["must_reverify"]:
<div class="copy">
<p class='activation-message'>
${_('To continue in the verified track in <strong>{course_name}</strong>, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)}
</p>
</div>
</div>
<nav class="nav-actions">
<h3 class="sr">Notification Actions</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div>
</div>
</div>
% endfor
%endif
%endif
%if reverifications["denied"]:
......
......@@ -11,13 +11,13 @@
% if reverifications["must_reverify"]:
% for item in reverifications["must_reverify"]:
<li class="status-item is-open">${_('<i class="icon-circle"></i><span class="label">Re-verify now:</span> <span class="course-name"><a href="">{course_name}</span></a>').format(course_name=item.course_name)}</li>
<li class="status-item is-open">${_('<i class="icon-circle-blank"></i><span class="label">Re-verify now:</span> <span class="course-name"><a href="">{course_name}</span></a>').format(course_name=item.course_name)}</li>
% endfor
%endif
% if reverifications["pending"]:
% for item in reverifications["pending"]:
<li class="status-item is-pending">${_('<i class="icon-circle"></i><span class="label">Pending:</span> <span class="course-name"><a href="">{course_name}</span></a>').format(course_name=item.course_name)}</li>
<li class="status-item is-pending">${_('<i class="icon-circle-blank"></i><span class="label">Pending:</span> <span class="course-name"><a href="">{course_name}</span></a>').format(course_name=item.course_name)}</li>
% endfor
%endif
......
......@@ -4,7 +4,7 @@
<%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">midcourse-reverification-process is-not-verified step-photos register</%block>
<%block name="title"><title>${_("Re-Verify | edX")}</title></%block>
<%block name="title"><title>${_("Re-Verify")}</title></%block>
<%block name="js_extra">
<script src="${static.url('js/vendor/responsive-carousel/responsive-carousel.js')}"></script>
......@@ -161,7 +161,7 @@
<div class="prompt-verify">
<h3 class="title">Before proceeding, please review carefully</h3>
<p class="copy"> ${_("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.")}</p>
<p class="copy"> ${_("Once you verify your photo looks good and your name is correct, you can finish your re-verification and return to your course. <strong>Note: You will not have another chance to re-verify.</strong>")}</p>
<ul class="list-actions">
<li class="action action-verify">
......
......@@ -7,10 +7,6 @@
<%block name="bodyclass">register verification-process is-not-verified step-confirmation</%block>
<%block name="title"><title>${_("Re-Verification Submission Confirmation")}</title></%block>
<%block name="js_extra">
<script src="${static.url('js/vendor/responsive-carousel/responsive-carousel.js')}"></script>
<script src="${static.url('js/vendor/responsive-carousel/responsive-carousel.keybd.js')}"></script>
</%block>
<%block name="content">
<div class="container">
......@@ -25,14 +21,20 @@
<div class="instruction">
<p>${_("We have received your re-verification details and submitted them for review. Your dashboard will show the notification status once the review is complete.")}</p>
<p>${_("The professor may ask you to re-verify again at other key points in the course.")}</p>
<p>${_("Please note: The professor may ask you to re-verify again at other key points in the course.")}</p>
</div>
<div class="actions-next">
<ol class="list-nav">
<li class="nav-item conditional">
<a class="action action-primary" href="">${_("Complete your other re-verifications")}</a>
</li>
<li class="nav-item">
<a class="action" href="${reverse('dashboard')}">${_("Return to where you left off")}</a>
</li>
</ol>
</div>
<ol class="list-nav">
<li class="nav-item">
<a class="action action-primary" href="${reverse('dashboard')}">${_("Return to Your Dashboard")}</a>
</li>
</ol>
</div> <!-- /view -->
</div> <!-- /wrapper-view -->
</section>
......
......@@ -4,7 +4,7 @@
<%block name="bodyclass">midcourse-reverification-process step-dash register</%block>
<%block name="title">
<title>
${_("Reverification Status | edX")}
${_("Reverification Status")}
</title>
</%block>
......@@ -14,14 +14,14 @@
<div class="wrapper-content-main">
<article class="content-main">
<h2 class="title">You are in the Verified track</h2>
<h2 class="title">${_("You are in the Verified track")}</h2>
<div class="copy">
% if reverifications["must_reverify"]:
% if len(reverifications["must_reverify"]) > 1:
<div class="wrapper-reverify-open">
<h3 class="title">You currently need to re-verify for the following courses:</h3>
<h3 class="title">${_("You currently need to re-verify for the following courses:")}</h3>
<ul class="reverification-list">
% for course_id, course_name, course_number, date, status in reverifications["must_reverify"]:
<li class="item">
......@@ -37,7 +37,7 @@
% elif reverifications["must_reverify"]:
<div class="wrapper-reverify-open">
<h3 class="title">You currently need to re-verify for the following course:</h3>
<h3 class="title">${_("You currently need to re-verify for the following course:")}</h3>
<ul class="reverification-list">
% 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"]:
<div class="wrapper-reverify-status">
<h3 class="title">The status of your submitted re-verifications:</h3>
<h3 class="title">${_("The status of your submitted re-verifications:")}</h3>
<ul class="reverification-list reverification-status">
% for course_id, course_name, course_number, date, status in reverifications["pending"]:
......@@ -64,7 +64,7 @@
<h3 class="course-name">${course_name} (${course_number})</h3>
<p class="deadline">Re-verify by <strong>${date}</strong></p>
</div>
<p class="reverify-status pending">Pending</p>
<p class="reverify-status pending">${_("Pending")}</p>
</li>
% endfor
......@@ -74,7 +74,7 @@
<h3 class="course-name">${course_name} (${course_number})</h3>
<p class="deadline">Re-verify by <strong>${date}</strong></p>
</div>
<p class="reverify-status complete">Complete</p>
<p class="reverify-status complete">${_("Complete")}</p>
</li>
% endfor
......@@ -84,7 +84,7 @@
<h3 class="course-name">${course_name} (${course_number})</h3>
<p class="deadline">Re-verify by <strong>${date}</strong></p>
</div>
<p class="reverify-status">Failed</p>
<p class="reverify-status">${_("Failed")}</p>
</li>
% endfor
......@@ -93,7 +93,7 @@
% endif
% else:
<p class="title">You have no re-verifications at present.</p>
<p class="title">${_("You have no re-verifications at present.")}</p>
% endif
% if reverifications["must_reverify"]:
......@@ -105,25 +105,25 @@
<div class="wrapper-reverification-help list-faq">
<div class="faq-item">
<h3 class="title faq-question">Why do I need to re-verify?</h3>
<h3 class="title faq-question">${_("Why do I need to re-verify?")}</h3>
<div class="copy faq-answer">
<p>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.</p>
<p>${_("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.")}</p>
</div>
</div>
<div class="faq-item">
<h3 class="title faq-question">What will I need to re-verify?</h3>
<h3 class="title faq-question">${_("What will I need to re-verify?")}</h3>
<div class="copy faq-answer">
<p>Because you are just confirming that you are still you, the only thing you will need to do to re-verify is to <b>submit a new photo of your face with your webcam</b>. The process is quick and you will be brought back to where you left off so you can keep on learning.</p>
<p>${_("Because you are just confirming that you are still you, the only thing you will need to do to re-verify is to <b>submit a new photo of your face with your webcam</b>. The process is quick and you will be brought back to where you left off so you can keep on learning.")}</p>
<p>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.</p>
<p>${_("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.")}</p>
</div>
</div>
<div class="faq-item">
<h3 class="title faq-question">What if I have trouble with my re-verification?</h3>
<h3 class="title faq-question">${_("What if I have trouble with my re-verification?")}</h3>
<div class="copy faq-answer">
<p>Because of the short time that re-verification is open, you <b>will not be able to correct a failed verification</b>. If you think there was an error in the review, please contact us at <a href="stuff">support@edx.org</a>.</p>
</div>
......
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