Skip to content

E
edx-platform
Commit 58618d8c by Matt Drayer Committed by Marco Morales
Options

Updated dashboard HTML, dropdown menu interactions, and tests

parent dfcb3f2b
Showing with 40 additions and 45 deletions
common/djangoapps/student/tests/test_bulk_email_settings.py
...@@ -86,6 +86,7 @@ class TestStudentDashboardEmailView(ModuleStoreTestCase): ...@@ -86,6 +86,7 @@ class TestStudentDashboardEmailView(ModuleStoreTestCase):
# Assert that the URL for the email view is not in the response # Assert that the URL for the email view is not in the response
# if this course isn't authorized # if this course isn't authorized
response = self.client.get(self.url) response = self.client.get(self.url)
print response.content
self.assertTrue(self.email_modal_link in response.content) self.assertTrue(self.email_modal_link in response.content)
......
lms/templates/dashboard.html
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
<span class="provider">${state.provider.NAME}</span> <span class="provider">${state.provider.NAME}</span>
<span class="control"> <span class="control">
% if state.has_account: % if state.has_account:
<form <form
action="${pipeline.get_disconnect_url(state.provider.NAME)}" action="${pipeline.get_disconnect_url(state.provider.NAME)}"
...@@ -177,20 +176,21 @@ ...@@ -177,20 +176,21 @@
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"> <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}">
<a href="#" onclick="document.${state.get_unlink_form_name()}.submit()"> <a href="#" onclick="document.${state.get_unlink_form_name()}.submit()">
## Translators: clicking on this removes the link between a user's edX account and their account with an external authentication provider (like Google or LinkedIn). ## Translators: clicking on this removes the link between a user's edX account and their account with an external authentication provider (like Google or LinkedIn).
${_("Unlink")} ${_("Unlink")}
</a> </a>
% else: </form>
% else:
<a href="${pipeline.get_login_url(state.provider.NAME, pipeline.AUTH_ENTRY_DASHBOARD, redirect_url='/')}"> <a href="${pipeline.get_login_url(state.provider.NAME, pipeline.AUTH_ENTRY_DASHBOARD, redirect_url='/')}">
## Translators: clicking on this creates a link between a user's edX account and their account with an external authentication provider (like Google or LinkedIn). ## Translators: clicking on this creates a link between a user's edX account and their account with an external authentication provider (like Google or LinkedIn).
${_("Link")} ${_("Link")}
</a> </a>
% endif % endif
</form>
</span> </span>
</div> </div>
% endfor % endfor
</span>
</span> </span>
</li> </li>
% endif % endif
......
lms/templates/dashboard/_dashboard_course_listing.html
...@@ -41,11 +41,9 @@ from student.helpers import ( ...@@ -41,11 +41,9 @@ from student.helpers import (
<% mode_class = '' %> <% mode_class = '' %>
% endif % endif
<article class="course${mode_class}"> <article class="course${mode_class}">
<% <% course_target = reverse('info', args=[course.id.to_deprecated_string()]) %>
course_target = reverse('info', args=[course.id.to_deprecated_string()])
%>
% if show_courseware_link: % if show_courseware_link:
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}" class="cover"> <a href="${course_target}" class="cover">
...@@ -72,30 +70,31 @@ from student.helpers import ( ...@@ -72,30 +70,31 @@ from student.helpers import (
</span> </span>
% endif % endif
<section class="info"> <section class="info">
<hgroup> <hgroup>
<p class="date-block"> <p class="date-block">
% if course.has_ended(): % if course.has_ended():
${_("Course Completed - {end_date}").format(end_date=course.end_datetime_text("DATE_TIME"))} ${_("Course Completed - {end_date}").format(end_date=course.end_datetime_text("DATE_TIME"))}
% elif course.has_started(): % elif course.has_started():
${_("Course Started - {start_date}").format(start_date=course.start_datetime_text("DATE_TIME"))} ${_("Course Started - {start_date}").format(start_date=course.start_datetime_text("DATE_TIME"))}
% elif course.start_date_is_still_default: # Course start date TBD % elif course.start_date_is_still_default: # Course start date TBD
${_("Course has not yet started")} ${_("Course has not yet started")}
% else: # hasn't started yet % else: # hasn't started yet
${_("Course Starts - {start_date}").format(start_date=course.start_datetime_text("DATE_TIME"))} ${_("Course Starts - {start_date}").format(start_date=course.start_datetime_text("DATE_TIME"))}
% endif % endif
</p> </p>
</hgroup> </hgroup>
<section class="details"> </section>
<section class="details">
% if show_courseware_link: % if show_courseware_link:
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}" class="cover"> <a href="${course_target}" class="cover">
<img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Home Page').format(course_number=course.number, course_name=course.display_name_with_default) |h}" /> <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Home Page').format(course_number=course.number, course_name=course.display_name_with_default) |h}" />
</a> </a>
% else: % else:
<a class="fade-cover"> <a class="fade-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}" /> <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> </a>
% endif % endif
% else: % else:
<div class="cover"> <div class="cover">
...@@ -115,9 +114,9 @@ from student.helpers import ( ...@@ -115,9 +114,9 @@ from student.helpers import (
<h3 class="course-title"> <h3 class="course-title">
% if show_courseware_link: % if show_courseware_link:
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}">${course.display_name_with_default}</a> <a href="${course_target}">${course.display_name_with_default}</a>
% else: % else:
<a class="disable-look">${course.display_name_with_default}</a> <a class="disable-look">${course.display_name_with_default}</a>
% endif % endif
% else: % else:
<span>${course.display_name_with_default}</span> <span>${course.display_name_with_default}</span>
...@@ -128,13 +127,13 @@ from student.helpers import ( ...@@ -128,13 +127,13 @@ from student.helpers import (
<span class="info-course-id">${course.display_number_with_default | h}</span> <span class="info-course-id">${course.display_number_with_default | h}</span>
<span class="info-date-block" data-tooltip="Hi"> <span class="info-date-block" data-tooltip="Hi">
% if course.has_ended(): % if course.has_ended():
${_("Ended - {end_date}").format(end_date=course.end_datetime_text("SHORT_DATE"))} ${_("Ended - {end_date}").format(end_date=course.end_datetime_text("SHORT_DATE"))}
% elif course.has_started(): % elif course.has_started():
${_("Started - {start_date}").format(start_date=course.start_datetime_text("SHORT_DATE"))} ${_("Started - {start_date}").format(start_date=course.start_datetime_text("SHORT_DATE"))}
% elif course.start_date_is_still_default: # Course start date TBD % elif course.start_date_is_still_default: # Course start date TBD
${_("Coming Soon")} ${_("Coming Soon")}
% else: # hasn't started yet % else: # hasn't started yet
${_("Starts - {start_date}").format(start_date=course.start_datetime_text("SHORT_DATE"))} ${_("Starts - {start_date}").format(start_date=course.start_datetime_text("SHORT_DATE"))}
% endif % endif
</span> </span>
</div> </div>
...@@ -252,10 +251,6 @@ from student.helpers import ( ...@@ -252,10 +251,6 @@ from student.helpers import (
</div> </div>
% endif % endif
</div> </div>
</section> </section>
<aside class="wrapper-messages-primary"> <aside class="wrapper-messages-primary">
<ul class="messages-list"> <ul class="messages-list">
...@@ -364,10 +359,9 @@ from student.helpers import ( ...@@ -364,10 +359,9 @@ from student.helpers import (
% endif % endif
</ul> </ul>
</aside> </aside>
</article> </article>
</li> </li>
<script> <script>
$( document ).ready(function() { $( document ).ready(function() {
if("${is_course_blocked}" == "True"){ if("${is_course_blocked}" == "True"){
...@@ -376,4 +370,4 @@ from student.helpers import ( ...@@ -376,4 +370,4 @@ from student.helpers import (
}); });
} }
}); });
</script> </script>
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