diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee index 4363043789..76557a517c 100644 --- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee @@ -73,19 +73,19 @@ class @Sequence @$('.sequence-nav-buttons a').unbind('click') if @contents.length == 0 - @$('.sequence-nav-buttons .prev a').addClass('disabled') - @$('.sequence-nav-buttons .next a').addClass('disabled') + @$('.sequence-nav-buttons .prev a').addClass('disabled').attr('aria-hidden', 'true') + @$('.sequence-nav-buttons .next a').addClass('disabled').attr('aria-hidden', 'true') return if @position == 1 - @$('.sequence-nav-buttons .prev a').addClass('disabled') + @$('.sequence-nav-buttons .prev a').addClass('disabled').attr('aria-hidden', 'true') else - @$('.sequence-nav-buttons .prev a').removeClass('disabled').click(@previous) + @$('.sequence-nav-buttons .prev a').removeClass('disabled').attr('aria-hidden', 'false').click(@previous) if @position == @contents.length - @$('.sequence-nav-buttons .next a').addClass('disabled') + @$('.sequence-nav-buttons .next a').addClass('disabled').attr('aria-hidden', 'true') else - @$('.sequence-nav-buttons .next a').removeClass('disabled').click(@next) + @$('.sequence-nav-buttons .next a').removeClass('disabled').attr('aria-hidden', 'false').click(@next) render: (new_position) -> if @position != new_position @@ -113,8 +113,6 @@ class @Sequence sequence_links = @content_container.find('a.seqnav') sequence_links.click @goto - # Focus on the first available xblock. - @content_container.find('.vert .xblock :first').focus() @$("a.active").blur() goto: (event) => diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 5fc55212a8..73d1e9d59b 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -89,7 +89,6 @@ class SequenceModule(SequenceFields, XModule): fragment.add_frag_resources(rendered_child) titles = child.get_content_titles() - print titles childinfo = { 'content': rendered_child.content, 'title': "\n".join(titles), diff --git a/common/templates/xblock_wrapper.html b/common/templates/xblock_wrapper.html index 56f847eac6..7c637493b4 100644 --- a/common/templates/xblock_wrapper.html +++ b/common/templates/xblock_wrapper.html @@ -1,3 +1,3 @@ -
+
${content}
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 835a5df0df..5aa5935fc6 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -19,7 +19,7 @@ ${page_title_breadcrumbs(course_name())} <%static:css group='style-course-vendor'/> <%static:css group='style-course'/> -<%block name="nav_skip">#course-content +<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"} <%include file="../discussion/_js_head_dependencies.html" /> @@ -176,7 +176,7 @@ ${fragment.foot_html()} % if accordion: <%include file="/dashboard/_dashboard_prompt_midcourse_reverify.html" /> - <%include file="/courseware/course_navigation.html" args="active_page='courseware'" /> + <%include file="/courseware/course_navigation.html" args="active_page='courseware'" /> % endif
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index 1d67c48941..75aba41d0e 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -36,33 +36,21 @@ site_status_msg = get_site_status_msg(course_id) % endif - -% if course: -
-% else: -
-% endif -