From 3df7286d724297a36e299a81a5ab7e87e467ba3a Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Mon, 13 Feb 2017 10:10:55 -0500
Subject: [PATCH 1/3] moving tabindex

---
 lms/templates/courseware/courseware-chromeless.html | 2 +-
 lms/templates/courseware/courseware.html            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 112ce928a0..5caf5b84b7 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -70,7 +70,7 @@ ${HTML(fragment.foot_html())}
 </%block>
 
 <div class="course-wrapper">
-  <section class="course-content" id="course-content">
+  <section class="course-content" id="course-content" tabindex="-1">
     ${HTML(fragment.body_html())}
   </section>
 </div>
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 37363b3681..4c32258fe6 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -150,9 +150,9 @@ ${HTML(fragment.foot_html())}
 
     </div>
 % endif
-    <section class="course-content" id="course-content">
+    <section class="course-content" id="course-content" tabindex="-1">
         <div class="path"></div>
-        <main id="main" aria-label="Content" tabindex="-1">
+        <main id="main" aria-label="Content">
         % if getattr(course, 'entrance_exam_enabled') and \
            getattr(course, 'entrance_exam_minimum_score_pct') and \
            entrance_exam_current_score is not UNDEFINED:

From 7fd52780608bffacb716e8e2f595c24116ba2745 Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Tue, 14 Feb 2017 16:02:08 -0500
Subject: [PATCH 2/3] just seeing what happens if i do this

---
 lms/templates/courseware/courseware-chromeless.html | 2 +-
 lms/templates/courseware/courseware.html            | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 5caf5b84b7..7fad511139 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -70,7 +70,7 @@ ${HTML(fragment.foot_html())}
 </%block>
 
 <div class="course-wrapper">
-  <section class="course-content" id="course-content" tabindex="-1">
+  <main class="course-content" id="main" tabindex="-1" aria-label="Content">
     ${HTML(fragment.body_html())}
   </section>
 </div>
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 4c32258fe6..6c6ebbae87 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -150,9 +150,8 @@ ${HTML(fragment.foot_html())}
 
     </div>
 % endif
-    <section class="course-content" id="course-content" tabindex="-1">
+    <main class="course-content" id="main" tabindex="-1" aria-label="Content">
         <div class="path"></div>
-        <main id="main" aria-label="Content">
         % if getattr(course, 'entrance_exam_enabled') and \
            getattr(course, 'entrance_exam_minimum_score_pct') and \
            entrance_exam_current_score is not UNDEFINED:
@@ -184,8 +183,7 @@ ${HTML(fragment.foot_html())}
         % endif
 
           ${HTML(fragment.body_html())}
-        </main>
-    </section>
+    </main>
 
     <section class="courseware-results-wrapper">
       <div id="loading-message" aria-live="polite" aria-relevant="all"></div>

From 0a5ec53189f6a7ab45fc54134c2a2036f6334227 Mon Sep 17 00:00:00 2001
From: Sanford Student <sanfordstudent@C02QJ0RCG8WM.tld>
Date: Wed, 15 Feb 2017 14:42:55 -0500
Subject: [PATCH 3/3] moving main

---
 .../courseware/courseware-chromeless.html     |  6 +-
 lms/templates/courseware/courseware.html      | 64 ++++++++++---------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 7fad511139..39c062dbab 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -70,8 +70,10 @@ ${HTML(fragment.foot_html())}
 </%block>
 
 <div class="course-wrapper">
-  <main class="course-content" id="main" tabindex="-1" aria-label="Content">
-    ${HTML(fragment.body_html())}
+  <section class="course-content" id="course-content">
+      <main id="main" tabindex="-1" aria-label="Content">
+        ${HTML(fragment.body_html())}
+      </main>
   </section>
 </div>
 % if course.show_calculator or is_edxnotes_enabled(course):
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 6c6ebbae87..c82ca94ac2 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -150,40 +150,42 @@ ${HTML(fragment.foot_html())}
 
     </div>
 % endif
-    <main class="course-content" id="main" tabindex="-1" aria-label="Content">
-        <div class="path"></div>
-        % if getattr(course, 'entrance_exam_enabled') and \
-           getattr(course, 'entrance_exam_minimum_score_pct') and \
-           entrance_exam_current_score is not UNDEFINED:
-            % if not entrance_exam_passed:
-            <p class="sequential-status-message">
-                ${_('To access course materials, you must score {required_score}% or higher on this \
-                exam. Your current score is {current_score}%.').format(
-                    required_score=int(round(course.entrance_exam_minimum_score_pct * 100)),
-                    current_score=int(round(entrance_exam_current_score * 100))
-                )}
-            </p>
-            <script type="text/javascript">
-            $(document).ajaxSuccess(function(event, xhr, settings) {
-                if (settings.url.indexOf("xmodule_handler/problem_check") > -1) {
-                    var data = JSON.parse(xhr.responseText);
-                    if (data.entrance_exam_passed){
-                        location.reload();
+    <section class="course-content" id="course-content">
+        <main id="main" tabindex="-1" aria-label="Content">
+            <div class="path"></div>
+            % if getattr(course, 'entrance_exam_enabled') and \
+               getattr(course, 'entrance_exam_minimum_score_pct') and \
+               entrance_exam_current_score is not UNDEFINED:
+                % if not entrance_exam_passed:
+                <p class="sequential-status-message">
+                    ${_('To access course materials, you must score {required_score}% or higher on this \
+                    exam. Your current score is {current_score}%.').format(
+                        required_score=int(round(course.entrance_exam_minimum_score_pct * 100)),
+                        current_score=int(round(entrance_exam_current_score * 100))
+                    )}
+                </p>
+                <script type="text/javascript">
+                $(document).ajaxSuccess(function(event, xhr, settings) {
+                    if (settings.url.indexOf("xmodule_handler/problem_check") > -1) {
+                        var data = JSON.parse(xhr.responseText);
+                        if (data.entrance_exam_passed){
+                            location.reload();
+                        }
                     }
-                }
-            });
-            </script>
-            % else:
-              <p class="sequential-status-message">
-                ${_('Your score is {current_score}%. You have passed the entrance exam.').format(
-                    current_score=int(round(entrance_exam_current_score * 100))
-                )}
-            </p>
+                });
+                </script>
+                % else:
+                  <p class="sequential-status-message">
+                    ${_('Your score is {current_score}%. You have passed the entrance exam.').format(
+                        current_score=int(round(entrance_exam_current_score * 100))
+                    )}
+                </p>
+                % endif
             % endif
-        % endif
 
-          ${HTML(fragment.body_html())}
-    </main>
+              ${HTML(fragment.body_html())}
+        </main>
+    </section>
 
     <section class="courseware-results-wrapper">
       <div id="loading-message" aria-live="polite" aria-relevant="all"></div>