Updated dashboard HTML, dropdown menu interactions, and tests

common/djangoapps/student/tests/test_bulk_email_settings.py

@@ -86,6 +86,7 @@ class TestStudentDashboardEmailView(ModuleStoreTestCase):
         # Assert that the URL for the email view is not in the response
         # if this course isn't authorized
         response = self.client.get(self.url)
+        print response.content
         self.assertTrue(self.email_modal_link in response.content)
 
 

lms/templates/dashboard.html

@@ -168,7 +168,6 @@
 
               <span class="provider">${state.provider.NAME}</span>
               <span class="control">
-
               % if state.has_account:
                 <form
                   action="${pipeline.get_disconnect_url(state.provider.NAME)}"
@@ -180,17 +179,18 @@
                   ## 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")}
                   </a>
+                </form>
               % else:
                   <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).
                   ${_("Link")}
                   </a>
               % endif
-              </form>
-
               </span>
             </div>
             % endfor
+
+            </span>
           </span>
         </li>
         % endif

lms/templates/dashboard/_dashboard_course_listing.html

@@ -41,11 +41,9 @@ from student.helpers import (
     <% mode_class = '' %>
   % 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 not is_course_blocked:
         <a href="${course_target}" class="cover">
@@ -86,6 +84,7 @@ from student.helpers import (
       % endif
       </p>
     </hgroup>
+  </section>
   <section class="details">
       % if show_courseware_link:
         % if not is_course_blocked:
@@ -252,10 +251,6 @@ from student.helpers import (
           </div>
         % endif
       </div>
-
-
-
-
   </section>
   <aside class="wrapper-messages-primary">
     <ul class="messages-list">
@@ -364,10 +359,9 @@ from student.helpers import (
         % endif
     </ul>
   </aside>
-
 </article>
 </li>
- <script>
+<script>
            $( document ).ready(function() {
 
                if("${is_course_blocked}" == "True"){
@@ -376,4 +370,4 @@ from student.helpers import (
                    });
                }
            });
- </script>
+</script>