Commit 6813b27b by Dave St.Germain

Remove coursename from page H1, and slightly improve sequence navigation

parent 28382316
...@@ -73,19 +73,19 @@ class @Sequence ...@@ -73,19 +73,19 @@ class @Sequence
@$('.sequence-nav-buttons a').unbind('click') @$('.sequence-nav-buttons a').unbind('click')
if @contents.length == 0 if @contents.length == 0
@$('.sequence-nav-buttons .prev a').addClass('disabled') @$('.sequence-nav-buttons .prev a').addClass('disabled').attr('aria-hidden', 'true')
@$('.sequence-nav-buttons .next a').addClass('disabled') @$('.sequence-nav-buttons .next a').addClass('disabled').attr('aria-hidden', 'true')
return return
if @position == 1 if @position == 1
@$('.sequence-nav-buttons .prev a').addClass('disabled') @$('.sequence-nav-buttons .prev a').addClass('disabled').attr('aria-hidden', 'true')
else 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 if @position == @contents.length
@$('.sequence-nav-buttons .next a').addClass('disabled') @$('.sequence-nav-buttons .next a').addClass('disabled').attr('aria-hidden', 'true')
else 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) -> render: (new_position) ->
if @position != new_position if @position != new_position
...@@ -113,8 +113,6 @@ class @Sequence ...@@ -113,8 +113,6 @@ class @Sequence
sequence_links = @content_container.find('a.seqnav') sequence_links = @content_container.find('a.seqnav')
sequence_links.click @goto sequence_links.click @goto
# Focus on the first available xblock.
@content_container.find('.vert .xblock :first').focus()
@$("a.active").blur() @$("a.active").blur()
goto: (event) => goto: (event) =>
......
...@@ -89,7 +89,6 @@ class SequenceModule(SequenceFields, XModule): ...@@ -89,7 +89,6 @@ class SequenceModule(SequenceFields, XModule):
fragment.add_frag_resources(rendered_child) fragment.add_frag_resources(rendered_child)
titles = child.get_content_titles() titles = child.get_content_titles()
print titles
childinfo = { childinfo = {
'content': rendered_child.content, 'content': rendered_child.content,
'title': "\n".join(titles), 'title': "\n".join(titles),
......
<div class="${' '.join(classes)}" ${data_attributes} tabindex="0"> <div class="${' '.join(classes)}" ${data_attributes}>
${content} ${content}
</div> </div>
...@@ -19,7 +19,7 @@ ${page_title_breadcrumbs(course_name())} ...@@ -19,7 +19,7 @@ ${page_title_breadcrumbs(course_name())}
<%static:css group='style-course-vendor'/> <%static:css group='style-course-vendor'/>
<%static:css group='style-course'/> <%static:css group='style-course'/>
<%block name="nav_skip">#course-content</%block> <%block name="nav_skip">${"#seq_content" if section_title else "#course-content"}</%block>
<%include file="../discussion/_js_head_dependencies.html" /> <%include file="../discussion/_js_head_dependencies.html" />
...@@ -182,7 +182,7 @@ ${fragment.foot_html()} ...@@ -182,7 +182,7 @@ ${fragment.foot_html()}
% if accordion: % if accordion:
<%include file="/dashboard/_dashboard_prompt_midcourse_reverify.html" /> <%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 % endif
<div class="container"> <div class="container">
......
...@@ -36,33 +36,21 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -36,33 +36,21 @@ site_status_msg = get_site_status_msg(course_id)
% endif % endif
</%block> </%block>
<header class="global ${"slim" if course else ""}" aria-label="${_('Global Navigation')}">
% if course: <nav>
<header class="global slim" aria-label="${_('Global Navigation')}"> <h1 class="logo">
% else: <a href="${marketing_link('ROOT')}">
<header class="global" aria-label="${_('Global Navigation')}"> <%block name="navigation_logo">
% endif <img src="${static.url(branding.get_logo_url())}" alt="${platform_name()}"/>
<nav> </%block>
</a>
<h1 class="logo"> </h1>
<a href="${marketing_link('ROOT')}">
<%block name="navigation_logo">
<img src="${static.url(branding.get_logo_url())}" alt="
% if course:
${course.display_org_with_default | h}: ${course.display_number_with_default | h} ${course.display_name_with_default | h} @
% endif
${platform_name()}
" />
</%block>
</a>
</h1>
% if course: % if course:
<h2><span class="provider">${course.display_org_with_default | h}:</span> ${course.display_number_with_default | h} ${course.display_name_with_default}</h2> <h2><span class="provider">${course.display_org_with_default | h}:</span> ${course.display_number_with_default | h} ${course.display_name_with_default}</h2>
% endif % endif
% if user.is_authenticated(): % if user.is_authenticated():
<ol class="left nav-global authenticated"> <ol class="left nav-global authenticated">
<%block name="navigation_global_links_authenticated"> <%block name="navigation_global_links_authenticated">
% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment