From 05e1b99388b459a75d91657b5fba1a1938aea270 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 7 Nov 2013 16:47:29 -0500 Subject: [PATCH 1/4] Refactor out certificate logic from the course listing. LMS-1477 --- .../_dashboard_certificate_information.html | 52 +++++++++++++++++++ .../dashboard/_dashboard_course_listing.html | 51 +----------------- 2 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 lms/templates/dashboard/_dashboard_certificate_information.html diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html new file mode 100644 index 0000000000..f8b5a5f20c --- /dev/null +++ b/lms/templates/dashboard/_dashboard_certificate_information.html @@ -0,0 +1,52 @@ +<%page args="cert_status, course, enrollment" /> + +<%! from django.utils.translation import ugettext as _ %> + +<% +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' +%> +
+ +% if cert_status['status'] == 'processing': +

${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}

+% elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'): +

${_("Your final grade:")} + ${"{0:.0f}%".format(float(cert_status['grade'])*100)}. + % if cert_status['status'] == 'notpassing': + ${_("Grade required for a certificate:")} + ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}. + % elif cert_status['status'] == 'restricted': +

+ ${_("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='{email}.'.format(email=settings.CONTACT_EMAIL))} +

+ % endif +

+% endif + +% if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']: + +% endif +
+ diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 30c60fb9f1..db8cfbd10e 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -58,54 +58,7 @@ % if course.has_ended() and cert_status and not enrollment.mode == 'audit': - <% - 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' - %> -
- - % if cert_status['status'] == 'processing': -

${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}

- % elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'): -

${_("Your final grade:")} - ${"{0:.0f}%".format(float(cert_status['grade'])*100)}. - % if cert_status['status'] == 'notpassing': - ${_("Grade required for a certificate:")} - ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}. - % elif cert_status['status'] == 'restricted': -

- ${_("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='{email}.'.format(email=settings.CONTACT_EMAIL))} -

- % endif -

- % endif - - % if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']: - - % endif -
- + <%include file='_dashboard_certificate_information.html' args='cert_status=cert_status,course=course, enrollment=enrollment'/> % endif %if course_mode_info['show_upsell']: @@ -157,4 +110,4 @@ - \ No newline at end of file + From ded97b59da5e5f3ad99edf2fc565d0c69bd948a3 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 7 Nov 2013 17:41:11 -0500 Subject: [PATCH 2/4] Add a new status for verified certificates. LMS-1477 --- .../dashboard/_dashboard_certificate_information.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html index f8b5a5f20c..b63e0c4d9c 100644 --- a/lms/templates/dashboard/_dashboard_certificate_information.html +++ b/lms/templates/dashboard/_dashboard_certificate_information.html @@ -35,11 +35,16 @@ else: % if cert_status['show_disabled_download_button']:
  • ${_("Your Certificate is Generating")}
    • - % elif cert_status['show_download_url']: + % elif cert_status['show_download_url'] and enrollment.mode == 'honor':
  • ${_("Download Your PDF Certificate")}
    • + % elif cert_status['show_download_url'] and enrollment.mode == 'verified': +
  • + + ${_("Download Your PDF Certificate")}
    • % endif % if cert_status['show_survey_button']: From b2c12cfe04ff8ec38f707aaa8240104e512e18ca Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 8 Nov 2013 10:54:46 -0500 Subject: [PATCH 3/4] LMS: revises certificate download copy --- .../dashboard/_dashboard_certificate_information.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html index b63e0c4d9c..eb997d9076 100644 --- a/lms/templates/dashboard/_dashboard_certificate_information.html +++ b/lms/templates/dashboard/_dashboard_certificate_information.html @@ -39,12 +39,12 @@ else:
  • - ${_("Download Your PDF Certificate")}
    • + ${_("Download Your Certificate (PDF)")} % elif cert_status['show_download_url'] and enrollment.mode == 'verified':
  • - ${_("Download Your PDF Certificate")}
    • + ${_("Download Your ID Verified Certificate of Achievement (PDF)")} % endif % if cert_status['show_survey_button']: From aa8348a7ed3da091721307e4d857acc4c1b9f9c4 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Tue, 12 Nov 2013 10:22:41 -0500 Subject: [PATCH 4/4] Add in a new hook for people who are embargoed in the verified cert track. LMS-1477 --- .../dashboard/_dashboard_certificate_information.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html index eb997d9076..ea5171c0ef 100644 --- a/lms/templates/dashboard/_dashboard_certificate_information.html +++ b/lms/templates/dashboard/_dashboard_certificate_information.html @@ -22,6 +22,10 @@ else: % if cert_status['status'] == 'notpassing': ${_("Grade required for a certificate:")} ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}. + % elif cert_status['status'] == 'restricted' and enrollment.mode == 'verified': +

    + ${_("Your verified 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}. If you would like a refund on your certificate, please contact our billing address {billing_email}").format(email='{email}.'.format(email=settings.CONTACT_EMAIL), billing_email='{email}'.format(email=settings.PAYMENT_SUPPORT_EMAIL))} +

    % elif cert_status['status'] == 'restricted':

    ${_("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='{email}.'.format(email=settings.CONTACT_EMAIL))}