From f4bdd73839dcc80b7b247bec68da45595c4b3948 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 5 Sep 2013 14:28:53 -0400
Subject: [PATCH] Verification: adds in verified/enrollment status into
dashboard course listings
---
lms/static/sass/multicourse/_dashboard.scss | 84 +++++-
lms/templates/dashboard.html | 308 ++++++++++----------
2 files changed, 231 insertions(+), 161 deletions(-)
diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 6b2e85b1c56..578fa68964e 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -1,3 +1,6 @@
+// lms - views - user/student dashboard
+// ====================
+
.dashboard {
@include clearfix;
padding: 60px 0 0 0;
@@ -224,6 +227,7 @@
}
}
+ // course listings
.my-courses {
float: left;
margin: 0px;
@@ -268,21 +272,30 @@
}
}
- .my-course {
- clear: both;
- @include clearfix;
- margin-right: flex-gutter();
- margin-bottom: 50px;
- padding-bottom: 50px;
- border-bottom: 1px solid $border-color-1;
- position: relative;
- width: flex-grid(12);
- z-index: 20;
- @include transition(all 0.15s linear 0s);
+ // UI: course list
+ .listing-courses {
+ @extend .ui-no-list;
+
+ .course-item {
+ margin-bottom: ($baseline*2.5);
+ border-bottom: 4px solid $border-color-l4;
+ padding-bottom: ($baseline*2.5);
- &:last-child {
- margin-bottom: none;
+ &:last-child {
+ margin-bottom: 0;
+ border-bottom: none;
+ padding-bottom: 0;
+ }
}
+ }
+
+ // UI: individual course item
+ .course {
+ @include box-sizing(box);
+ @include transition(all 0.15s linear 0s);
+ @include clearfix();
+ @extend .ui-depth2;
+ position: relative;
.cover {
@include box-sizing(border-box);
@@ -402,6 +415,51 @@
}
}
}
+
+ // 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;
+
+ // FIXME: bad, but needed selector!
+ .info > hgroup .date-block {
+ top: ($baseline*1.25);
+ }
+
+ // course enrollment status message
+ .sts-enrollment {
+ display: inline-block;
+ position: absolute;
+ top: -28px;
+ right: 0;
+ text-align: center;
+
+ .label {
+ @extend .text-sr;
+ }
+
+ .deco-graphic {
+ @extend .ui-depth3;
+ width: 40px;
+ position: absolute;
+ left: -30px;
+ top: -10px;
+ }
+
+ .sts-enrollment-value {
+ @extend .ui-depth1;
+ @extend .copy-badge;
+ border-radius: 0;
+ padding: ($baseline/4) ($baseline/2) ($baseline/4) $baseline;
+ color: $white;
+ background: $verified-color-lvl3;
+ }
+ }
+ }
+
}
.message-status {
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 31c3c33ef1b..c76363bd590 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -13,6 +13,7 @@
<%namespace name='static' file='static_content.html'/>
<%block name="title"><title>${_("Dashboard")}</title></%block>
+<%block name="bodyclass">view-dashboard is-authenticated</%block>
<%block name="js_extra">
<script type="text/javascript">
@@ -101,7 +102,7 @@
},
error: function(xhr, textStatus, error) {
if (xhr.status == 403) {
- location.href = "${reverse('signin_user')}";
+ location.href = "${reverse('signin_user')}";
}
}
});
@@ -157,167 +158,178 @@
</header>
% if len(courses) > 0:
- % for course, enrollment in courses:
-
- <article class="my-course ${enrollment.mode}">
- <%
- course_target = reverse('info', args=[course.id])
- %>
-
-
-
- % if course.id in show_courseware_links_for:
- <a href="${course_target}" class="cover">
- <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course.number, course_name=course.display_name_with_default) |h}" />
- </a>
- % else:
- <div class="cover">
- <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course.number, course_name=course.display_name_with_default) | h}" />
- </div>
- % endif
-
- <section class="info">
- <hgroup>
- <p class="date-block">
- % if course.has_ended():
- ${_("Course Completed - {end_date}").format(end_date=course.end_date_text)}
- % elif course.has_started():
- ${_("Course Started - {start_date}").format(start_date=course.start_date_text)}
- % else: # hasn't started yet
- ${_("Course Starts - {start_date}").format(start_date=course.start_date_text)}
- % endif
- </p>
- <h2 class="university">${get_course_about_section(course, 'university')}</h2>
- <h3>
- % if course.id in show_courseware_links_for:
- <a href="${course_target}">${course.display_number_with_default | h} ${course.display_name_with_default}</a>
- % else:
- <span>${course.display_number_with_default | h} ${course.display_name_with_default}</span>
- % endif
- </h3>
- </hgroup>
-
+ <ul class="listing-courses">
+ % for course, enrollment in courses:
+ <li class="course-item">
+ <article class="course ${enrollment.mode}">
<%
- testcenter_exam_info = course.current_test_center_exam
- registration = exam_registrations.get(course.id)
- testcenter_register_target = reverse('begin_exam_registration', args=[course.id])
+ course_target = reverse('info', args=[course.id])
%>
- % if testcenter_exam_info is not None:
- % if registration is None and testcenter_exam_info.is_registering():
- <div class="message message-status is-shown exam-register">
- <a href="${testcenter_register_target}" class="button exam-button" id="exam_register_button">${_("Register for Pearson exam")}</a>
- <p class="message-copy">${_("Registration for the Pearson exam is now open and will close on {end_date}").format(end_date="<strong>{}</strong>".format(testcenter_exam_info.registration_end_date_text))}</p>
- </div>
- % endif
- <!-- display a registration for a current exam, even if the registration period is over -->
- % if registration is not None:
- % if registration.is_accepted:
- <div class="message message-status is-shown exam-schedule">
- <a href="${registration.registration_signup_url}" class="button exam-button">${_("Schedule Pearson exam")}</a>
- <p class="exam-registration-number">${_("{link_start}Registration{link_end} number: {number}").format(
- link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
- link_end='</a>',
- number=registration.client_candidate_id,
- )}</p>
- <p class="message-copy">${_("Write this down! You'll need it to schedule your exam.")}</p>
- </div>
- % endif
- % if registration.is_rejected:
- <div class="message message-status is-shown exam-schedule">
- <p class="message-copy">
- <strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format(
- link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
- link_end='</a>')}</strong>
- ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format(
- link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.display_number_with_default),
- link_end='</a>',
- email="exam-help@edx.org",
- )}
- </div>
- % endif
- % if not registration.is_accepted and not registration.is_rejected:
- <div class="message message-status is-shown">
- <p class="message-copy"><strong>${_("Your {link_start}registration for the Pearson exam{link_end} is pending.").format(link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target), link_end='</a>')}</strong>
- ${_("Within a few days, you should see a confirmation number here, which can be used to schedule your exam.")}
- </p>
- </div>
- % endif
- % endif
+ % if course.id in show_courseware_links_for:
+ <a href="${course_target}" class="cover">
+ <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course.number, course_name=course.display_name_with_default) |h}" />
+ </a>
+ % else:
+ <div class="cover">
+ <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course.number, course_name=course.display_name_with_default) | h}" />
+ </div>
% endif
- <%
- cert_status = cert_statuses.get(course.id)
- %>
- % if course.has_ended() and cert_status:
- <%
- if cert_status['status'] == 'generating':
- status_css_class = 'course-status-certrendering'
- elif cert_status['status'] == 'ready':
- status_css_class = 'course-status-certavailable'
- elif cert_status['status'] == 'notpassing':
- status_css_class = 'course-status-certnotavailable'
- else:
- status_css_class = 'course-status-processing'
- %>
- <div class="message message-status ${status_css_class} is-shown">
-
- % if cert_status['status'] == 'processing':
- <p class="message-copy">${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}</p>
- % elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'):
- <p class="message-copy">${_("Your final grade:")}
- <span class="grade-value">${"{0:.0f}%".format(float(cert_status['grade'])*100)}</span>.
- % if cert_status['status'] == 'notpassing':
- ${_("Grade required for a certificate:")} <span class="grade-value">
- ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}</span>.
- % elif cert_status['status'] == 'restricted':
- <p class="message-copy">
- ${_("Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {email}.").format(email='<a class="contact-link" href="mailto:{email}">{email}</a>.'.format(email=settings.CONTACT_EMAIL))}
- </p>
- % endif
- </p>
- % endif
+ % if enrollment.mode == "verified":
+ <span class="sts-enrollment">
+ <span class="label">${_("Enrolled as: ")}</span>
+ <img class="deco-graphic" src="${static.url('images/vcert-ribbon-s.png')}" alt="ID Verified Ribbon/Badge">
+ <span class="sts-enrollment-value">${_("ID Verified")}</span>
+ </span>
+ % endif
- % if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']:
- <ul class="actions">
- % if cert_status['show_disabled_download_button']:
- <li class="action"><span class="disabled">
- ${_("Your Certificate is Generating")}</span></li>
- % elif cert_status['show_download_url']:
- <li class="action">
- <a class="btn" href="${cert_status['download_url']}"
- title="${_('This link will open/download a PDF document')}">
- Download Your PDF Certificate</a></li>
- % endif
-
- % if cert_status['show_survey_button']:
- <li class="action"><a class="cta" href="${cert_status['survey_url']}">
- ${_('Complete our course feedback survey')}</a></li>
- % endif
- </ul>
+ <section class="info">
+ <hgroup>
+ <p class="date-block">
+ % if course.has_ended():
+ ${_("Course Completed - {end_date}").format(end_date=course.end_date_text)}
+ % elif course.has_started():
+ ${_("Course Started - {start_date}").format(start_date=course.start_date_text)}
+ % else: # hasn't started yet
+ ${_("Course Starts - {start_date}").format(start_date=course.start_date_text)}
% endif
- </div>
+ </p>
+ <h2 class="university">${get_course_about_section(course, 'university')}</h2>
+ <h3>
+ % if course.id in show_courseware_links_for:
+ <a href="${course_target}">${course.display_number_with_default | h} ${course.display_name_with_default}</a>
+ % else:
+ <span>${course.display_number_with_default | h} ${course.display_name_with_default}</span>
+ % endif
+ </h3>
+ </hgroup>
+
+ <%
+ testcenter_exam_info = course.current_test_center_exam
+ registration = exam_registrations.get(course.id)
+ testcenter_register_target = reverse('begin_exam_registration', args=[course.id])
+ %>
+ % if testcenter_exam_info is not None:
+
+ % if registration is None and testcenter_exam_info.is_registering():
+ <div class="message message-status is-shown exam-register">
+ <a href="${testcenter_register_target}" class="button exam-button" id="exam_register_button">${_("Register for Pearson exam")}</a>
+ <p class="message-copy">${_("Registration for the Pearson exam is now open and will close on {end_date}").format(end_date="<strong>{}</strong>".format(testcenter_exam_info.registration_end_date_text))}</p>
+ </div>
+ % endif
+ <!-- display a registration for a current exam, even if the registration period is over -->
+ % if registration is not None:
+ % if registration.is_accepted:
+ <div class="message message-status is-shown exam-schedule">
+ <a href="${registration.registration_signup_url}" class="button exam-button">${_("Schedule Pearson exam")}</a>
+ <p class="exam-registration-number">${_("{link_start}Registration{link_end} number: {number}").format(
+ link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
+ link_end='</a>',
+ number=registration.client_candidate_id,
+ )}</p>
+ <p class="message-copy">${_("Write this down! You'll need it to schedule your exam.")}</p>
+ </div>
+ % endif
+ % if registration.is_rejected:
+ <div class="message message-status is-shown exam-schedule">
+ <p class="message-copy">
+ <strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format(
+ link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
+ link_end='</a>')}</strong>
+ ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format(
+ link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.display_number_with_default),
+ link_end='</a>',
+ email="exam-help@edx.org",
+ )}
+ </div>
+ % endif
+ % if not registration.is_accepted and not registration.is_rejected:
+ <div class="message message-status is-shown">
+ <p class="message-copy"><strong>${_("Your {link_start}registration for the Pearson exam{link_end} is pending.").format(link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target), link_end='</a>')}</strong>
+ ${_("Within a few days, you should see a confirmation number here, which can be used to schedule your exam.")}
+ </p>
+ </div>
+ % endif
+ % endif
+ % endif
- % endif
+ <%
+ cert_status = cert_statuses.get(course.id)
+ %>
+ % if course.has_ended() and cert_status:
+ <%
+ if cert_status['status'] == 'generating':
+ status_css_class = 'course-status-certrendering'
+ elif cert_status['status'] == 'ready':
+ status_css_class = 'course-status-certavailable'
+ elif cert_status['status'] == 'notpassing':
+ status_css_class = 'course-status-certnotavailable'
+ else:
+ status_css_class = 'course-status-processing'
+ %>
+ <div class="message message-status ${status_css_class} is-shown">
+
+ % if cert_status['status'] == 'processing':
+ <p class="message-copy">${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}</p>
+ % elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'):
+ <p class="message-copy">${_("Your final grade:")}
+ <span class="grade-value">${"{0:.0f}%".format(float(cert_status['grade'])*100)}</span>.
+ % if cert_status['status'] == 'notpassing':
+ ${_("Grade required for a certificate:")} <span class="grade-value">
+ ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}</span>.
+ % elif cert_status['status'] == 'restricted':
+ <p class="message-copy">
+ ${_("Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {email}.").format(email='<a class="contact-link" href="mailto:{email}">{email}</a>.'.format(email=settings.CONTACT_EMAIL))}
+ </p>
+ % endif
+ </p>
+ % endif
+
+ % if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']:
+ <ul class="actions">
+ % if cert_status['show_disabled_download_button']:
+ <li class="action"><span class="disabled">
+ ${_("Your Certificate is Generating")}</span></li>
+ % elif cert_status['show_download_url']:
+ <li class="action">
+ <a class="btn" href="${cert_status['download_url']}"
+ title="${_('This link will open/download a PDF document')}">
+ Download Your PDF Certificate</a></li>
+ % endif
+
+ % if cert_status['show_survey_button']:
+ <li class="action"><a class="cta" href="${cert_status['survey_url']}">
+ ${_('Complete our course feedback survey')}</a></li>
+ % endif
+ </ul>
+ % endif
+ </div>
- % if course.id in show_courseware_links_for:
- % if course.has_ended():
- <a href="${course_target}" class="enter-course archived">${_('View Archived Course')}</a>
- % else:
- <a href="${course_target}" class="enter-course">${_('View Course')}</a>
% endif
- % endif
- <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">${_('Unregister')}</a>
- % if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and modulestore().get_modulestore_type(course.id) == MONGO_MODULESTORE_TYPE:
- <!-- Only show the Email Settings link/modal if this course has bulk email feature enabled -->
- <a href="#email-settings-modal" class="email-settings" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}" data-optout="${course.id in course_optouts}">${_('Email Settings')}</a>
- % endif
- </section>
- </article>
+
+ % if course.id in show_courseware_links_for:
+ % if course.has_ended():
+ <a href="${course_target}" class="enter-course archived">${_('View Archived Course')}</a>
+ % else:
+ <a href="${course_target}" class="enter-course">${_('View Course')}</a>
+ % endif
+ % endif
+
+ <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">${_('Unregister')}</a>
+ % if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and modulestore().get_modulestore_type(course.id) == MONGO_MODULESTORE_TYPE:
+ <!-- Only show the Email Settings link/modal if this course has bulk email feature enabled -->
+ <a href="#email-settings-modal" class="email-settings" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}" data-optout="${course.id in course_optouts}">${_('Email Settings')}</a>
+ % endif
+ </section>
+ </article>
+ </li>
% endfor
+
+ </ul>
% else:
<section class="empty-dashboard-message">
<p>${_("Looks like you haven't registered for any courses yet.")}</p>
--
GitLab