Merge pull request #1216 from edx/diana/dashboard-cleanup

Some dasbhoard template cleanup

CHANGELOG.rst

@@ -6,6 +6,8 @@ in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
 
+LMS: Refactor and clean student dashboard templates.
+
 LMS: Fix issue with CourseMode expiration dates
 
 CMS: Add text_customization Dict to advanced settings which can support

common/djangoapps/student/views.py

@@ -48,6 +48,7 @@ from certificates.models import CertificateStatuses, certificate_status_for_stud
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.django import modulestore
+from xmodule.modulestore import MONGO_MODULESTORE_TYPE
 
 from collections import namedtuple
 
@@ -295,7 +296,10 @@ def dashboard(request):
 
     cert_statuses = {course.id: cert_info(request.user, course) for course, _enrollment in courses}
 
-    exam_registrations = {course.id: exam_registration_info(request.user, course) for course, _enrollment in courses}
+    # only show email settings for Mongo course and when bulk email is turned on
+    show_email_settings_for = frozenset(course.id for course, _enrollment in courses
+                                        if (settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and
+                                            modulestore().get_modulestore_type(course.id) == MONGO_MODULESTORE_TYPE))
 
     # get info w.r.t ExternalAuthMap
     external_auth_map = None
@@ -312,7 +316,7 @@ def dashboard(request):
                'errored_courses': errored_courses,
                'show_courseware_links_for': show_courseware_links_for,
                'cert_statuses': cert_statuses,
-               'exam_registrations': exam_registrations,
+               'show_email_settings_for': show_email_settings_for,
                }
 
     return render_to_response('dashboard.html', context)

lms/templates/dashboard/dashboard_course_listing.html

+<%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings" />
+
+<%! from django.utils.translation import ugettext as _ %>
+<%!
+  from django.core.urlresolvers import reverse
+  from courseware.courses import course_image_url, get_course_about_section
+  import waffle
+%>
+<li class="course-item">
+  <article class="course ${enrollment.mode}">
+    <%
+      if waffle.flag_is_active(request, 'merge_course_tabs'):
+          course_target = reverse('courseware', args=[course.id])
+      else:
+          course_target = reverse('info', args=[course.id])
+    %>
+
+    % if show_courseware_link:
+      <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
+
+    % 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
+
+    <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 show_courseware_link:
+            <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>
+
+      % 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>
+
+      % endif
+
+      % if show_courseware_link:
+        % 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 show_email_settings:
+        <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>