Going backwards in time...

openedx · Nov 18, 2015 · 3e9eee9 · 3e9eee9
1 parent aaeae47
commit 3e9eee9
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 16 deletions.
diff --git a/common/test/acceptance/pages/lms/course_page.py b/common/test/acceptance/pages/lms/course_page.py
@@ -56,6 +56,7 @@ def ensure_skip_link_sends_focus_to_container(self):
         Checks to make sure the skip link skips to its href
         and the container receives focus.
         """
+        from nose.tools import set_trace; set_trace()
         skip_link = self.q(css=".nav-skip")
         skip_url = skip_link.attrs('href')[0]
         skip_id = skip_url.split('/')[-1]

diff --git a/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py b/common/test/acceptance/tests/lms/test_lms_cohorted_courseware_search.py
@@ -267,6 +267,7 @@ def test_cohorted_search_user_staff_all_content(self):
         self._goto_staff_page().set_staff_view_mode('Staff')
         self.courseware_search_page.search_for_term(self.visible_to_all_html)
         assert self.visible_to_all_html in self.courseware_search_page.search_results.html[0]
+        # from nose.tools import set_trace; set_trace()
         self.courseware_search_page.clear_search()
         self.courseware_search_page.search_for_term(self.group_a_and_b_html)
         assert self.group_a_and_b_html in self.courseware_search_page.search_results.html[0]

diff --git a/lms/static/js/search/course/views/search_results_view.js b/lms/static/js/search/course/views/search_results_view.js
@@ -9,7 +9,7 @@ define([
     return SearchResultsView.extend({
 
         el: '#courseware-search-results',
-        contentElement: '#content',
+        contentElement: '#course-content',
         resultsTemplateId: '#course_search_results-tpl',
         loadingTemplateId: '#search_loading-tpl',
         errorTemplateId: '#search_error-tpl',

diff --git a/lms/static/js/search/dashboard/views/search_results_view.js b/lms/static/js/search/dashboard/views/search_results_view.js
@@ -9,7 +9,7 @@ define([
     return SearchResultsView.extend({
 
         el: '#dashboard-search-results',
-        contentElement: '#content, #profile-sidebar',
+        contentElement: '#my-courses, #profile-sidebar',
         resultsTemplateId: '#dashboard_search_results-tpl',
         loadingTemplateId: '#search_loading-tpl',
         errorTemplateId: '#search_error-tpl',

diff --git a/lms/static/js/spec/search/search_spec.js b/lms/static/js/spec/search/search_spec.js
@@ -488,9 +488,9 @@ define([
             function beforeEachHelper(SearchResultsView) {
                 appendSetFixtures(
                     '<section id="courseware-search-results"></section>' +
-                    '<section id="content"></section>' +
+                    '<section id="course-content"></section>' +
                     '<section id="dashboard-search-results"></section>' +
-                    '<section id="content"></section>'
+                    '<section id="my-courses"></section>'
                 );
 
                 TemplateHelpers.installTemplates([
@@ -674,14 +674,14 @@ define([
                     loadFixtures('js/fixtures/search/course_search_form.html');
                     appendSetFixtures(
                         '<section id="courseware-search-results"></section>' +
-                        '<section id="content"></section>'
+                        '<section id="course-content"></section>'
                     );
                     loadTemplates.call(this);
 
                     var courseId = 'a/b/c';
                     CourseSearchFactory(courseId);
                     spyOn(Backbone.history, 'navigate');
-                    this.$contentElement = $('#content');
+                    this.$contentElement = $('#course-content');
                     this.$searchResults = $('#courseware-search-results');
                 });
 
@@ -700,20 +700,15 @@ define([
 
                 beforeEach(function () {
                     loadFixtures('js/fixtures/search/dashboard_search_form.html');
-                    // appendSetFixtures(
-                    //     '<section id="dashboard-search-results"></section>' +
-                    //     '<section id="my-courses"></section>'
-                    // );
                     appendSetFixtures(
                         '<section id="dashboard-search-results"></section>' +
-                        '<section id="content"></section>'
+                        '<section id="my-courses"></section>'
                     );
                     loadTemplates.call(this);
                     DashboardSearchFactory();
 
                     spyOn(Backbone.history, 'navigate');
-                    // this.$contentElement = $('#my-courses');
-                    this.$contentElement = $('#content');
+                    this.$contentElement = $('#my-courses');
                     this.$searchResults = $('#dashboard-search-results');
                 });
 

diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
@@ -38,6 +38,8 @@
 <%static:css group='style-student-notes'/>
 % endif
 
+<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"}</%block>
+
 <%include file="../discussion/_js_head_dependencies.html" />
   ${fragment.head_html()}
 </%block>

diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
@@ -56,6 +56,8 @@
 <%static:css group='style-student-notes'/>
 % endif
 
+<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"}</%block>
+
 <%include file="../discussion/_js_head_dependencies.html" />
   ${fragment.head_html()}
 </%block>

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
@@ -18,6 +18,7 @@
 
 <%block name="pagetitle">${_("Dashboard")}</%block>
 <%block name="bodyclass">view-dashboard is-authenticated</%block>
+<%block name="nav_skip">#my-courses</%block>
 
 <%block name="header_extras">
 % for template_name in ["donation"]:
@@ -74,7 +75,7 @@
 </div>
 
 <section class="container dashboard" id="dashboard-main">
-  <section class="my-courses" id="my-content">
+  <section class="my-courses" id="my-courses">
     <header class="wrapper-header-courses">
       <h2 class="header-courses">${_("My Courses")}</h2>
     </header>

diff --git a/lms/templates/main.html b/lms/templates/main.html
@@ -130,7 +130,7 @@
 % if not disable_window_wrap:
   <div class="window-wrap" dir="${static.dir_rtl()}">
 % endif
-    <a class="nav-skip" href="#content">${_("Skip to main content")}</a>
+    <a class="nav-skip" href="<%block name="nav_skip">#content</%block>">${_("Skip to main content")}</a>
 
     % if not disable_header:
         <%include file="${header_file}" />

diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
@@ -28,7 +28,7 @@
 
 <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
   <div class="window-wrap" dir="${static.dir_rtl()}">
-    <a class="nav-skip" href="#content">{% trans "Skip to main content" %}</a>
+    <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
     {% with course=request.course %}
       {% if IS_EDX_DOMAIN %}
         {% include "navigation-edx.html" %}

diff --git a/lms/templates/ux/reference/teams-base.html b/lms/templates/ux/reference/teams-base.html
@@ -96,6 +96,7 @@ <h2><span class="provider">PlantsX:</span> GAR_123 Wild Life</h2>
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
+<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"}</%block>
 </%block>
 
 <%block name="js_extra">

diff --git a/lms/templates/ux/reference/teams-create.html b/lms/templates/ux/reference/teams-create.html
@@ -95,6 +95,7 @@ <h2><span class="provider">PlantsX:</span> GAR_123 Wild Life</h2>
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
+<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"}</%block>
 </%block>
 
 <%block name="js_extra">