From cb22b909b6a961ff0e502a092929612cddd438e6 Mon Sep 17 00:00:00 2001
From: Lucky Jindal <luckyjindal@C02P61UBG3QP.tld>
Date: Mon, 24 Oct 2016 12:27:26 -0400
Subject: [PATCH 1/2] AC-588: Fixed header levels,removed unneccessary element

---
 lms/static/sass/course/_info.scss            |  7 ++++---
 lms/templates/courseware/course_updates.html | 11 +++++------
 lms/templates/courseware/info.html           |  9 +++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss
index f834766d82..2d1a57b24f 100644
--- a/lms/static/sass/course/_info.scss
+++ b/lms/static/sass/course/_info.scss
@@ -48,7 +48,7 @@ div.info-wrapper {
     width: 100%;
     display: block;
 
-    h1 {
+    h1,h3 {
       @include text-align(left);
       @extend %t-strong;
       @extend %t-title6;
@@ -60,7 +60,7 @@ div.info-wrapper {
       margin-bottom: lh();
     }
 
-    > ol,section {
+    > ol,section,div {
       list-style: none;
       margin-bottom: lh();
       padding-left: 0;
@@ -104,7 +104,7 @@ div.info-wrapper {
           }
         }
 
-        h2.date {
+        .date {
           @extend %t-title9;
           margin-bottom: ($baseline/4);
           text-transform: none;
@@ -112,6 +112,7 @@ div.info-wrapper {
           @include padding-left($baseline);
           @include float(left);
         }
+      
 
         .toggle-visibility-button {
           @extend %t-title9;
diff --git a/lms/templates/courseware/course_updates.html b/lms/templates/courseware/course_updates.html
index 54767db943..4cb983b947 100644
--- a/lms/templates/courseware/course_updates.html
+++ b/lms/templates/courseware/course_updates.html
@@ -1,11 +1,10 @@
 <%! from django.utils.translation import ugettext as _ %>
-<section aria-labelledby="course-updates-heading">
-    <h2 class="hd hd-2 sr" id="course-updates-heading">${_('All course updates')}</h2>
+<div>
 <div class="recent-updates">
   % for index, update in enumerate(visible_updates):
     <article class="updates-article">
       % if not update.get("is_error"):
-        <h2 class="date" id="msg-date-${index}">${update.get("date")}</h2>
+        <div class="date" id="msg-date-${index}">${update.get("date")}</div>      
         <button
             class="toggle-visibility-button"
             data-hide="${_('Hide')}"
@@ -16,7 +15,7 @@
         ></button>
       % endif
       <div class="toggle-visibility-element article-content ${'hidden' if index >= 1 else ''}" id="msg-content-${index}">
-        ${update.get("content")}
+      ${update.get("content")}
       </div>
     </article>
   % endfor
@@ -35,7 +34,7 @@
 <div class="old-updates hidden toggle-visibility-element" id="old-updates">
   % for index, update in enumerate(hidden_updates):
     <article class="updates-article">
-      <h2 class="date" id="msg-date-${index + len(visible_updates)}">${update.get("date")}</h2>
+      <div class="date" id="msg-date-${index + len(visible_updates)}">${update.get("date")}</div>
       <button
           class="toggle-visibility-button"
           data-hide="${_('Hide')}"
@@ -48,4 +47,4 @@
     </article>
   % endfor
 </div>
-</section>
+<div>
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
index 8bf2ae859f..e32d891b22 100644
--- a/lms/templates/courseware/info.html
+++ b/lms/templates/courseware/info.html
@@ -60,8 +60,9 @@ from openedx.core.djangolib.markup import HTML, Text
     <div class="container">
       <div class="home">
         <div class="page-header-main">
-            <h1 class="page-title">${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default)}</h1>
-            <h2 class="page-subtitle">${course.display_name_with_default}</h2>
+            <h3 class="page-title">${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default)}
+            <div class="page-subtitle">${course.display_name_with_default}</div>
+            </h3>
         </div>
         % if last_accessed_courseware_url:
           <div class="page-header-secondary">
@@ -80,7 +81,7 @@ from openedx.core.djangolib.markup import HTML, Text
           </div>
           % endif
 
-          <h1>${_("Course Updates and News")}</h1>
+          <h4>${_("Course Updates and News")}</h4>
           ${HTML(get_course_info_section(request, masquerade_user, course, 'updates'))}
 
           ## CourseTalk widget
@@ -93,7 +94,7 @@ from openedx.core.djangolib.markup import HTML, Text
         <section aria-label="${_('Handout Navigation')}" class="handouts">
 
       % if SelfPacedConfiguration.current().enable_course_home_improvements:
-            <h1 class="handouts-header">${_("Important Course Dates")}</h1>
+            <h4 class="handouts-header">${_("Important Course Dates")}</h1>
             ## Should be organized by date, last date appearing at the bottom
 
             % for course_date in get_course_date_blocks(course, user):

From 282ded7442e6a19c43d8f6edaa44f066fdbd0a86 Mon Sep 17 00:00:00 2001
From: "Albert St. Aubin" <astaubin@edx.org>
Date: Tue, 22 Nov 2016 09:54:28 -0500
Subject: [PATCH 2/2] Addressed test failures and PR comments TNL-5894

---
 .../test/acceptance/pages/lms/course_info.py  |  2 +-
 .../courseware/tests/test_course_info.py      |  6 +-
 .../courseware/tests/test_date_summary.py     |  4 +-
 lms/templates/courseware/course_updates.html  |  6 +-
 lms/templates/courseware/info.html            | 86 +++++++++----------
 5 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/common/test/acceptance/pages/lms/course_info.py b/common/test/acceptance/pages/lms/course_info.py
index eb617bc4fe..abb773f439 100644
--- a/common/test/acceptance/pages/lms/course_info.py
+++ b/common/test/acceptance/pages/lms/course_info.py
@@ -20,7 +20,7 @@ class CourseInfoPage(CoursePage):
         """
         Return the number of updates on the page.
         """
-        return len(self.q(css='section.updates section article').results)
+        return len(self.q(css='.updates .updates-article').results)
 
     @property
     def handout_links(self):
diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py
index bab762367e..a584ca6948 100644
--- a/lms/djangoapps/courseware/tests/test_course_info.py
+++ b/lms/djangoapps/courseware/tests/test_course_info.py
@@ -216,15 +216,15 @@ class CourseInfoTitleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         )
         self.assertIn(
             expected_title,
-            content('h1.page-title').contents()
+            content('.page-title').contents()[0]
         )
         self.assertIn(
             expected_display_title,
-            display_content('h1.page-title').contents()
+            display_content('.page-title').contents()[0]
         )
         self.assertIn(
             display_course.display_name_with_default,
-            display_content('h2.page-subtitle').contents()
+            display_content('.page-subtitle').contents()
         )
 
 
diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py
index ec123683b4..edffea818d 100644
--- a/lms/djangoapps/courseware/tests/test_date_summary.py
+++ b/lms/djangoapps/courseware/tests/test_date_summary.py
@@ -180,7 +180,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         self.client.login(username='mrrobot', password='test')
 
         html_elements = [
-            '<h1 class="handouts-header">Important Course Dates</h1>',
+            '<h4 class="handouts-header">Important Course Dates</h4>',
             '<div class="date-summary-container">',
             '<div class="date-summary date-summary-todays-date">',
             '<h3 class="heading localized-datetime"',
@@ -202,7 +202,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         response = self.client.get(url)
 
         html_elements = [
-            '<h1 class="handouts-header">Important Course Dates</h1>',
+            '<h4 class="handouts-header">Important Course Dates</h4>',
             '<div class="date-summary-container">',
             '<div class="date-summary date-summary-todays-date">',
             '<h3 class="heading localized-datetime"',
diff --git a/lms/templates/courseware/course_updates.html b/lms/templates/courseware/course_updates.html
index 4cb983b947..28dde7f258 100644
--- a/lms/templates/courseware/course_updates.html
+++ b/lms/templates/courseware/course_updates.html
@@ -1,10 +1,9 @@
 <%! from django.utils.translation import ugettext as _ %>
-<div>
 <div class="recent-updates">
   % for index, update in enumerate(visible_updates):
     <article class="updates-article">
       % if not update.get("is_error"):
-        <div class="date" id="msg-date-${index}">${update.get("date")}</div>      
+        <h5 class="date" id="msg-date-${index}">${update.get("date")}</h5>
         <button
             class="toggle-visibility-button"
             data-hide="${_('Hide')}"
@@ -34,7 +33,7 @@
 <div class="old-updates hidden toggle-visibility-element" id="old-updates">
   % for index, update in enumerate(hidden_updates):
     <article class="updates-article">
-      <div class="date" id="msg-date-${index + len(visible_updates)}">${update.get("date")}</div>
+      <h5 class="date" id="msg-date-${index + len(visible_updates)}">${update.get("date")}</h5>
       <button
           class="toggle-visibility-button"
           data-hide="${_('Hide')}"
@@ -47,4 +46,3 @@
     </article>
   % endfor
 </div>
-<div>
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
index e32d891b22..7e9b874341 100644
--- a/lms/templates/courseware/info.html
+++ b/lms/templates/courseware/info.html
@@ -61,7 +61,7 @@ from openedx.core.djangolib.markup import HTML, Text
       <div class="home">
         <div class="page-header-main">
             <h3 class="page-title">${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default)}
-            <div class="page-subtitle">${course.display_name_with_default}</div>
+              <div class="page-subtitle">${course.display_name_with_default}</div>
             </h3>
         </div>
         % if last_accessed_courseware_url:
@@ -71,14 +71,14 @@ from openedx.core.djangolib.markup import HTML, Text
         % endif
       </div>
       <div class="info-wrapper">
-        % if user.is_authenticated():
+      % if user.is_authenticated():
         <section class="updates">
           % if studio_url is not None and masquerade and masquerade.role == 'staff':
-          <div class="wrap-instructor-info studio-view">
-            <a class="instructor-info-action" href="${studio_url}">
-              ${_("View Updates in Studio")}
-            </a>
-          </div>
+            <div class="wrap-instructor-info studio-view">
+              <a class="instructor-info-action" href="${studio_url}">
+                ${_("View Updates in Studio")}
+              </a>
+            </div>
           % endif
 
           <h4>${_("Course Updates and News")}</h4>
@@ -86,56 +86,56 @@ from openedx.core.djangolib.markup import HTML, Text
 
           ## CourseTalk widget
           % if show_coursetalk_widget:
-          <div class="coursetalk-write-reviews">
-            <div id="ct-custom-read-review-widget" data-provider="${platform_key}" data-course="${course_review_key}"></div>
-          </div>
+            <div class="coursetalk-write-reviews">
+              <div id="ct-custom-read-review-widget" data-provider="${platform_key}" data-course="${course_review_key}"></div>
+            </div>
           % endif
         </section>
+
         <section aria-label="${_('Handout Navigation')}" class="handouts">
 
-      % if SelfPacedConfiguration.current().enable_course_home_improvements:
-            <h4 class="handouts-header">${_("Important Course Dates")}</h1>
-            ## Should be organized by date, last date appearing at the bottom
+          % if SelfPacedConfiguration.current().enable_course_home_improvements:
+                <h4 class="handouts-header">${_("Important Course Dates")}</h4>
+                ## Should be organized by date, last date appearing at the bottom
 
-            % for course_date in get_course_date_blocks(course, user):
-                <div class="date-summary-container">
-                    <div class="date-summary date-summary-${course_date.css_class}">
-                        % if course_date.title:
-                            % if course_date.title == 'current_datetime':
-                                <h3 class="heading localized-datetime" data-datetime="${course_date.date}" data-string="${_(u'Today is {date}')}" data-timezone="${user_timezone}" data-language="${user_language}"></h3>
-                            % else:
-                                <h3 class="heading">${course_date.title}</h3>
+                % for course_date in get_course_date_blocks(course, user):
+                    <div class="date-summary-container">
+                        <div class="date-summary date-summary-${course_date.css_class}">
+                            % if course_date.title:
+                                % if course_date.title == 'current_datetime':
+                                    <h3 class="heading localized-datetime" data-datetime="${course_date.date}" data-string="${_(u'Today is {date}')}" data-timezone="${user_timezone}" data-language="${user_language}"></h3>
+                                % else:
+                                    <h3 class="heading">${course_date.title}</h3>
+                                % endif
                             % endif
-                        % endif
-                        % if course_date.date and course_date.title != 'current_datetime':
-                            <h4 class="date localized-datetime" data-format="shortDate" data-datetime="${course_date.date}" data-timezone="${user_timezone}" data-language="${user_language}" data-string="${_(course_date.relative_datestring)}"></h4>
-                        % endif
-                        % if course_date.description:
-                          <p class="description">${course_date.description}</p>
-                        % endif
-                        % if course_date.link and course_date.link_text:
-                          <span class="date-summary-link">
-                              <a href="${course_date.link}">${course_date.link_text}</a>
-                          </span>
-                        % endif
+                            % if course_date.date and course_date.title != 'current_datetime':
+                                <h4 class="date localized-datetime" data-format="shortDate" data-datetime="${course_date.date}" data-timezone="${user_timezone}" data-language="${user_language}" data-string="${_(course_date.relative_datestring)}"></h4>
+                            % endif
+                            % if course_date.description:
+                              <p class="description">${course_date.description}</p>
+                            % endif
+                            % if course_date.link and course_date.link_text:
+                              <span class="date-summary-link">
+                                  <a href="${course_date.link}">${course_date.link_text}</a>
+                              </span>
+                            % endif
+                        </div>
                     </div>
-                </div>
-            % endfor
-      % endif
-        <h1 class="handouts-header">${_(course.info_sidebar_name)}</h1>
-        ${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
+                % endfor
+            % endif
+            <h4 class="handouts-header">${_(course.info_sidebar_name)}</h4>
+            ${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
         </section>
-    % else:
+      % else:
         <section class="updates">
-          <h1 class="handouts-header">${_("Course Updates and News")}</h1>
+          <h4 class="handouts-header">${_("Course Updates and News")}</h4>
           ${HTML(get_course_info_section(request, masquerade_user, course, 'guest_updates'))}
         </section>
         <section aria-label="${_('Handout Navigation')}" class="handouts">
-          <h1 class="handouts-header">${_("Course Handouts")}</h1>
+          <h4 class="handouts-header">${_("Course Handouts")}</h4>
           ${HTML(get_course_info_section(request, masquerade_user, course, 'guest_handouts'))}
         </section>
-
-    % endif
+      % endif <!-- if course authenticated -->
       </div>
   </div>
 </main>