Skip to content

E
edx-platform
Commit 8e347f40 by clrux
Options

Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links 

AC-342 sending skip links to single main, relevant
parents 68719748 2a23757f
Showing with 167 additions and 113 deletions
cms/templates/base.html
...@@ -54,7 +54,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -54,7 +54,7 @@ from openedx.core.djangolib.js_utils import (
<body class="${static.dir_rtl()} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE}"> <body class="${static.dir_rtl()} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE}">
<%block name="view_notes"></%block> <%block name="view_notes"></%block>
<a class="nav-skip" href="#content">${_("Skip to main content")}</a> <a class="nav-skip" href="#main">${_("Skip to main content")}</a>
<script type="text/javascript"> <script type="text/javascript">
window.baseUrl = "${settings.STATIC_URL | n, js_escaped_string}"; window.baseUrl = "${settings.STATIC_URL | n, js_escaped_string}";
...@@ -72,9 +72,11 @@ from openedx.core.djangolib.js_utils import ( ...@@ -72,9 +72,11 @@ from openedx.core.djangolib.js_utils import (
<%block name="page_alert"></%block> <%block name="page_alert"></%block>
</div> </div>
<div id="content" tabindex="-1"> <main id="main" aria-label="Content" tabindex="-1">
<div id="content">
<%block name="content"></%block> <%block name="content"></%block>
</div> </div>
</main>
% if user.is_authenticated(): % if user.is_authenticated():
<%include file="widgets/sock.html" args="online_help_token=online_help_token" /> <%include file="widgets/sock.html" args="online_help_token=online_help_token" />
......
cms/templates/course-create-rerun.html
...@@ -22,7 +22,7 @@ from openedx.core.djangolib.js_utils import js_escaped_string ...@@ -22,7 +22,7 @@ from openedx.core.djangolib.js_utils import js_escaped_string
</%block> </%block>
<%block name="content"> <%block name="content">
<div id="content" tabindex="-1"> <div id="content">
<div class="wrapper-mast wrapper"> <div class="wrapper-mast wrapper">
<header class="mast mast-wizard has-actions"> <header class="mast mast-wizard has-actions">
<h1 class="page-header"> <h1 class="page-header">
......
lms/static/js/fixtures/edxnotes/edxnotes.html
<section class="container"> <section class="container">
<div class="wrapper-student-notes"> <div class="wrapper-student-notes">
<div class="student-notes"> <div class="student-notes">
<main id="main" aria-label="Content" tabindex="-1">
<div class="title-search-container"> <div class="title-search-container">
<div class="wrapper-title"> <div class="wrapper-title">
<h1 class="page-title"> <h1 class="page-title">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<span class="copy">Loading</span> <span class="copy">Loading</span>
</div> </div>
</section> </section>
</main>
</div> </div>
</div> </div>
</section> </section>
lms/templates/ccx/coach_dashboard.html
...@@ -10,7 +10,6 @@ from openedx.core.djangolib.js_utils import ( ...@@ -10,7 +10,6 @@ from openedx.core.djangolib.js_utils import (
%> %>
<%block name="pagetitle">${_("CCX Coach Dashboard")}</%block> <%block name="pagetitle">${_("CCX Coach Dashboard")}</%block>
<%block name="nav_skip">#ccx-coach-dashboard-content</%block>
<%block name="headextra"> <%block name="headextra">
<%static:css group='style-course-vendor'/> <%static:css group='style-course-vendor'/>
...@@ -23,6 +22,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -23,6 +22,7 @@ from openedx.core.djangolib.js_utils import (
<section class="container"> <section class="container">
<div class="instructor-dashboard-wrapper-2"> <div class="instructor-dashboard-wrapper-2">
<main id="main" aria-label="Content" tabindex="-1">
<section class="instructor-dashboard-content-2" id="ccx-coach-dashboard-content"> <section class="instructor-dashboard-content-2" id="ccx-coach-dashboard-content">
<h1>${_("CCX Coach Dashboard")}</h1> <h1>${_("CCX Coach Dashboard")}</h1>
...@@ -83,6 +83,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -83,6 +83,7 @@ from openedx.core.djangolib.js_utils import (
%endif %endif
</section> </section>
</main>
</div> </div>
</section> </section>
......
lms/templates/courseware/courses.html
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
<%block name="pagetitle">${_("Courses")}</%block> <%block name="pagetitle">${_("Courses")}</%block>
<section class="find-courses"> <main id="main" aria-label="Content" tabindex="-1">
<section class="find-courses">
<section class="courses-container"> <section class="courses-container">
% if course_discovery_enabled: % if course_discovery_enabled:
<div id="discovery-form" role="search" aria-label="course" class="wrapper-search-context"> <div id="discovery-form" role="search" aria-label="course" class="wrapper-search-context">
...@@ -72,4 +73,5 @@ ...@@ -72,4 +73,5 @@
% endif % endif
</section> </section>
</section> </section>
</main>
lms/templates/courseware/courseware-chromeless.html
...@@ -37,8 +37,6 @@ ${static.get_page_title_breadcrumbs(course_name())} ...@@ -37,8 +37,6 @@ ${static.get_page_title_breadcrumbs(course_name())}
<%static:css group='style-student-notes'/> <%static:css group='style-student-notes'/>
% endif % endif
<%block name="nav_skip">${"#content" if section_title else "#content"}</%block>
<%include file="../discussion/_js_head_dependencies.html" /> <%include file="../discussion/_js_head_dependencies.html" />
${fragment.head_html()} ${fragment.head_html()}
</%block> </%block>
......
lms/templates/courseware/courseware.html
...@@ -57,8 +57,6 @@ ${static.get_page_title_breadcrumbs(course_name())} ...@@ -57,8 +57,6 @@ ${static.get_page_title_breadcrumbs(course_name())}
<%static:css group='style-student-notes'/> <%static:css group='style-student-notes'/>
% endif % endif
<%block name="nav_skip">${"#content" if section_title else "#content"}</%block>
<%include file="../discussion/_js_head_dependencies.html" /> <%include file="../discussion/_js_head_dependencies.html" />
${fragment.head_html()} ${fragment.head_html()}
</%block> </%block>
...@@ -170,7 +168,8 @@ ${fragment.foot_html()} ...@@ -170,7 +168,8 @@ ${fragment.foot_html()}
</div> </div>
% endif % endif
<section class="course-content" id="course-content" role="main" aria-label="Content"> <section class="course-content" id="course-content">
<main id="main" aria-label="Content" tabindex="-1">
% if getattr(course, 'entrance_exam_enabled') and \ % if getattr(course, 'entrance_exam_enabled') and \
getattr(course, 'entrance_exam_minimum_score_pct') and \ getattr(course, 'entrance_exam_minimum_score_pct') and \
entrance_exam_current_score is not UNDEFINED: entrance_exam_current_score is not UNDEFINED:
...@@ -202,6 +201,7 @@ ${fragment.foot_html()} ...@@ -202,6 +201,7 @@ ${fragment.foot_html()}
% endif % endif
${fragment.body_html()} ${fragment.body_html()}
</main>
</section> </section>
<section class="courseware-results-wrapper"> <section class="courseware-results-wrapper">
......
lms/templates/courseware/info.html
...@@ -52,7 +52,9 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -52,7 +52,9 @@ from openedx.core.djangolib.markup import Text, HTML
</%block> </%block>
<%block name="bodyclass">view-in-course view-course-info ${course.css_class or ''}</%block> <%block name="bodyclass">view-in-course view-course-info ${course.css_class or ''}</%block>
<section class="container">
<main id="main" aria-label="Content" tabindex="-1">
<section class="container">
<div class="home"> <div class="home">
<div class="page-header-main"> <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> <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>
...@@ -105,4 +107,5 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -105,4 +107,5 @@ from openedx.core.djangolib.markup import Text, HTML
</section> </section>
% endif % endif
</div> </div>
</section> </section>
</main>
lms/templates/courseware/progress.html
...@@ -18,7 +18,6 @@ from django.utils.http import urlquote_plus ...@@ -18,7 +18,6 @@ from django.utils.http import urlquote_plus
<%namespace name="progress_graph" file="/courseware/progress_graph.js"/> <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
<%block name="pagetitle">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</%block> <%block name="pagetitle">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</%block>
<%block name="nav_skip">#content</%block>
<%block name="js_extra"> <%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js') | h}"></script> <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js') | h}"></script>
...@@ -37,6 +36,7 @@ from django.utils.http import urlquote_plus ...@@ -37,6 +36,7 @@ from django.utils.http import urlquote_plus
<div class="container"> <div class="container">
<div class="profile-wrapper"> <div class="profile-wrapper">
<main id="main" aria-label="Content" tabindex="-1">
<div class="course-info" id="course-info-progress" aria-label="${_('Course Progress')}"> <div class="course-info" id="course-info-progress" aria-label="${_('Course Progress')}">
% if staff_access and studio_url is not None: % if staff_access and studio_url is not None:
<div class="wrap-instructor-info"> <div class="wrap-instructor-info">
...@@ -219,6 +219,6 @@ from django.utils.http import urlquote_plus ...@@ -219,6 +219,6 @@ from django.utils.http import urlquote_plus
</div> <!--End chapters--> </div> <!--End chapters-->
</div> </div>
</main>
</div> </div>
</div> </div>
lms/templates/courseware/static_tab.html
...@@ -16,8 +16,10 @@ ...@@ -16,8 +16,10 @@
<%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" /> <%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" />
<section class="container"> <main id="main" aria-label="Content" tabindex="-1">
<section class="container">
<div class="static_tab_wrapper"> <div class="static_tab_wrapper">
${tab_contents} ${tab_contents}
</div> </div>
</section> </section>
</main>
lms/templates/dashboard.html
...@@ -19,7 +19,6 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -19,7 +19,6 @@ from openedx.core.djangolib.markup import Text, HTML
<%block name="pagetitle">${_("Dashboard")}</%block> <%block name="pagetitle">${_("Dashboard")}</%block>
<%block name="bodyclass">view-dashboard is-authenticated</%block> <%block name="bodyclass">view-dashboard is-authenticated</%block>
<%block name="nav_skip">#my-courses</%block>
<%block name="header_extras"> <%block name="header_extras">
% for template_name in ["donation"]: % for template_name in ["donation"]:
...@@ -75,8 +74,9 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -75,8 +74,9 @@ from openedx.core.djangolib.markup import Text, HTML
%endif %endif
</div> </div>
<section class="container dashboard" id="dashboard-main"> <main id="main" aria-label="Content" tabindex="-1">
<section class="my-courses" id="my-courses" role="main" tabindex="-1"> <section class="container dashboard" id="dashboard-main">
<section class="my-courses" id="my-courses">
<header class="wrapper-header-courses"> <header class="wrapper-header-courses">
<h2 class="header-courses">${_("My Courses")}</h2> <h2 class="header-courses">${_("My Courses")}</h2>
</header> </header>
...@@ -188,7 +188,8 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -188,7 +188,8 @@ from openedx.core.djangolib.markup import Text, HTML
</ul> </ul>
</div> </div>
% endif % endif
</section> </section>
</main>
<section id="email-settings-modal" class="modal" aria-hidden="true"> <section id="email-settings-modal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="email-settings-title"> <div class="inner-wrapper" role="dialog" aria-labelledby="email-settings-title">
......
lms/templates/discussion/index.html
...@@ -8,7 +8,6 @@ from django.core.urlresolvers import reverse ...@@ -8,7 +8,6 @@ from django.core.urlresolvers import reverse
<%block name="bodyclass">discussion</%block> <%block name="bodyclass">discussion</%block>
<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block> <%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
<%block name="nav_skip">#discussion-container</%block>
<%block name="headextra"> <%block name="headextra">
<%static:css group='style-course-vendor'/> <%static:css group='style-course-vendor'/>
...@@ -39,13 +38,14 @@ from django.core.urlresolvers import reverse ...@@ -39,13 +38,14 @@ from django.core.urlresolvers import reverse
data-sort-preference="${sort_preference | h}" data-sort-preference="${sort_preference | h}"
data-flag-moderator="${flag_moderator | h}" data-flag-moderator="${flag_moderator | h}"
data-user-cohort-id="${user_cohort | h}" data-user-cohort-id="${user_cohort | h}"
data-course-settings="${course_settings | h}" data-course-settings="${course_settings | h}">
tabindex="-1">
<div class="discussion-body"> <div class="discussion-body">
<div class="forum-nav" role="complementary" aria-label="${_("Discussion thread list")}"></div> <div class="forum-nav" role="complementary" aria-label="${_("Discussion thread list")}"></div>
<div class="discussion-column" role="main" aria-label="Discussion" id="discussion-column"> <div class="discussion-column" id="discussion-column">
<main id="main" aria-label="Content" tabindex="-1">
<article class="new-post-article" style="display: none" tabindex="-1" aria-label="${_("New topic form")}"></article> <article class="new-post-article" style="display: none" tabindex="-1" aria-label="${_("New topic form")}"></article>
<div class="forum-content"></div> <div class="forum-content"></div>
</main>
</div> </div>
</div> </div>
</section> </section>
......
lms/templates/edxnotes/edxnotes.html
...@@ -20,7 +20,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -20,7 +20,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
<section class="container"> <section class="container">
<div class="wrapper-student-notes"> <div class="wrapper-student-notes">
<div class="student-notes"> <div class="student-notes">
<main id="main" aria-label="Content" tabindex="-1">
<div class="title-search-container"> <div class="title-search-container">
<div class="wrapper-title"> <div class="wrapper-title">
<h1 class="page-title"> <h1 class="page-title">
...@@ -93,7 +93,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -93,7 +93,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
</section> </section>
% endif % endif
</section> </section>
</main>
</div> </div>
</div> </div>
</section> </section>
......
lms/templates/index.html
...@@ -5,7 +5,8 @@ from django.utils.translation import ugettext as _ ...@@ -5,7 +5,8 @@ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<section class="home"> <main id="main" aria-label="Content" tabindex="-1">
<section class="home">
<header> <header>
<div class="outer-wrapper"> <div class="outer-wrapper">
<div class="title"> <div class="title">
...@@ -46,7 +47,8 @@ from django.core.urlresolvers import reverse ...@@ -46,7 +47,8 @@ from django.core.urlresolvers import reverse
</header> </header>
<%include file="${courses_list}" /> <%include file="${courses_list}" />
</section> </section>
</main>
% if show_homepage_promo_video: % if show_homepage_promo_video:
<section id="video-modal" class="modal home-page-video-modal video-modal"> <section id="video-modal" class="modal home-page-video-modal video-modal">
......
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
...@@ -20,7 +20,6 @@ from django.core.urlresolvers import reverse ...@@ -20,7 +20,6 @@ from django.core.urlresolvers import reverse
## 6. And tests go in lms/djangoapps/instructor/tests/ ## 6. And tests go in lms/djangoapps/instructor/tests/
<%block name="pagetitle">${_("Instructor Dashboard")}</%block> <%block name="pagetitle">${_("Instructor Dashboard")}</%block>
<%block name="nav_skip">#content</%block>
<%block name="headextra"> <%block name="headextra">
<%static:css group='style-course-vendor'/> <%static:css group='style-course-vendor'/>
...@@ -86,6 +85,7 @@ from django.core.urlresolvers import reverse ...@@ -86,6 +85,7 @@ from django.core.urlresolvers import reverse
<section class="container"> <section class="container">
<div class="instructor-dashboard-wrapper-2"> <div class="instructor-dashboard-wrapper-2">
<main id="main" aria-label="Content" tabindex="-1">
<section class="instructor-dashboard-content-2" id="instructor-dashboard-content"> <section class="instructor-dashboard-content-2" id="instructor-dashboard-content">
<div class="wrap-instructor-info studio-view"> <div class="wrap-instructor-info studio-view">
%if studio_url: %if studio_url:
...@@ -121,6 +121,6 @@ from django.core.urlresolvers import reverse ...@@ -121,6 +121,6 @@ from django.core.urlresolvers import reverse
</section> </section>
% endfor % endfor
</section> </section>
</main>
</div> </div>
</section> </section>
lms/templates/learner_dashboard/programs.html
...@@ -20,8 +20,9 @@ ProgramListFactory({ ...@@ -20,8 +20,9 @@ ProgramListFactory({
</%block> </%block>
<%block name="pagetitle">${_("Programs")}</%block> <%block name="pagetitle">${_("Programs")}</%block>
<main id="main" aria-label="Content" tabindex="-1">
<div class="program-list-wrapper"> <div class="program-list-wrapper">
<div class="program-cards-container"></div> <div class="program-cards-container"></div>
<div class="sidebar"></div> <div class="sidebar"></div>
</div> </div>
</main>
lms/templates/main.html
...@@ -120,13 +120,13 @@ from pipeline_mako import render_require_js_path_overrides ...@@ -120,13 +120,13 @@ from pipeline_mako import render_require_js_path_overrides
% if not disable_window_wrap: % if not disable_window_wrap:
<div class="window-wrap" dir="${static.dir_rtl()}"> <div class="window-wrap" dir="${static.dir_rtl()}">
% endif % endif
<a class="nav-skip" href="<%block name="nav_skip">#content</%block>">${_("Skip to main content")}</a> <a class="nav-skip" href="#main">${_("Skip to main content")}</a>
% if not disable_header: % if not disable_header:
<%include file="${static.get_template_path('header.html')}" /> <%include file="${static.get_template_path('header.html')}" />
% endif % endif
<div role="main" class="content-wrapper" id="content" tabindex="-1"> <div class="content-wrapper" id="content">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
</div> </div>
......
lms/templates/main_django.html
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
<body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}"> <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
<div class="window-wrap" dir="${static.dir_rtl()}"> <div class="window-wrap" dir="${static.dir_rtl()}">
<a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a> <a class="nav-skip" href="#main">{% trans "Skip to main content" %}</a>
{% with course=request.course %} {% with course=request.course %}
{% include "header.html"|microsite_template_path %} {% include "header.html"|microsite_template_path %}
{% endwith %} {% endwith %}
<div role="main" class="content-wrapper" id="content" tabindex="-1"> <div class="content-wrapper" id="content">
{% block body %}{% endblock %} {% block body %}{% endblock %}
{% block bodyextra %}{% endblock %} {% block bodyextra %}{% endblock %}
</div> </div>
......
lms/templates/static_templates/404.html
...@@ -8,11 +8,13 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -8,11 +8,13 @@ from openedx.core.djangolib.markup import Text, HTML
<%block name="pagetitle">${_("Page Not Found")}</%block> <%block name="pagetitle">${_("Page Not Found")}</%block>
<section class="outside-app"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Page not found")}</h1> <section class="outside-app">
<p>${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format( <h1>${_("Page not found")}</h1>
<p>${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format(
link_start=HTML('<a href="/">'), link_start=HTML('<a href="/">'),
link_end=HTML('</a>'), link_end=HTML('</a>'),
email=HTML('<a href="mailto:{email}">{email}</a>').format(email=Text(static.get_tech_support_email_address())) email=HTML('<a href="mailto:{email}">{email}</a>').format(email=Text(static.get_tech_support_email_address()))
)}</p> )}</p>
</section> </section>
</main>
lms/templates/static_templates/about.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("About")}</%block> <%block name="pagetitle">${_("About")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("About")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("About")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/blog.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Blog")}</%block> <%block name="pagetitle">${_("Blog")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<section class="container about">
<h1>${_("Blog")}</h1> <h1>${_("Blog")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section> </section>
</main>
lms/templates/static_templates/contact.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Contact")}</%block> <%block name="pagetitle">${_("Contact")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Contact")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Contact")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/donate.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Donate")}</%block> <%block name="pagetitle">${_("Donate")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<section class="container about">
<h1>${_("Donate")}</h1> <h1>${_("Donate")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section> </section>
</main>
lms/templates/static_templates/embargo.html
...@@ -7,14 +7,16 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -7,14 +7,16 @@ from openedx.core.djangolib.markup import Text, HTML
<%block name="pagetitle">${_("This Course Unavailable In Your Country")}</%block> <%block name="pagetitle">${_("This Course Unavailable In Your Country")}</%block>
<section class="outside-app"> <main id="main" aria-label="Content" tabindex="-1">
<p> <section class="outside-app">
${Text(_("Our system indicates that you are trying to access this {platform_name} " <p>
${Text(_("Our system indicates that you are trying to access this {platform_name} "
"course from a country or region currently subject to U.S. economic and trade " "course from a country or region currently subject to U.S. economic and trade "
"sanctions. Unfortunately, at this time {platform_name} must comply with " "sanctions. Unfortunately, at this time {platform_name} must comply with "
"export controls, and we cannot allow you to access this course." "export controls, and we cannot allow you to access this course."
)).format( )).format(
platform_name=Text(settings.PLATFORM_NAME), platform_name=Text(settings.PLATFORM_NAME),
)} )}
</p> </p>
</section> </section>
</main>
lms/templates/static_templates/faq.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("FAQ")}</%block> <%block name="pagetitle">${_("FAQ")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("FAQ")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("FAQ")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/help.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Help")}</%block> <%block name="pagetitle">${_("Help")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Help")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Help")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/honor.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Honor Code")}</%block> <%block name="pagetitle">${_("Honor Code")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Honor Code")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Honor Code")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/jobs.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Jobs")}</%block> <%block name="pagetitle">${_("Jobs")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Jobs")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Jobs")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/media-kit.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Media Kit")}</%block> <%block name="pagetitle">${_("Media Kit")}</%block>
<section class="container about"> <main id="main" aria-label="Cntent" tabindex="-1">
<h1>${_("Media Kit")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Media Kit")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/news.html
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<%block name="pagetitle">${_("In the Press")}</%block> <%block name="pagetitle">${_("In the Press")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("In the Press")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("In the Press")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/press.html
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<%block name="pagetitle">${_("In the Press")}</%block> <%block name="pagetitle">${_("In the Press")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("In the Press")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("In the Press")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/privacy.html
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<%block name="pagetitle">${_("Privacy Policy")}</%block> <%block name="pagetitle">${_("Privacy Policy")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Privacy Policy")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Privacy Policy")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/static_templates/server-down.html
...@@ -5,7 +5,8 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -5,7 +5,8 @@ from openedx.core.djangolib.markup import Text, HTML
%> %>
<%inherit file="../main.html" /> <%inherit file="../main.html" />
<section class="outside-app"> <main id="main" aria-label="Content" tabindex="-1">
<section class="outside-app">
<h1> <h1>
${Text(_("Currently the {platform_name} servers are down")).format( ${Text(_("Currently the {platform_name} servers are down")).format(
platform_name=HTML(u"<em>{}</em>").format(Text(settings.PLATFORM_NAME)) platform_name=HTML(u"<em>{}</em>").format(Text(settings.PLATFORM_NAME))
...@@ -16,4 +17,5 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -16,4 +17,5 @@ from openedx.core.djangolib.markup import Text, HTML
"Please email us at {tech_support_email} to report any problems or downtime.")).format( "Please email us at {tech_support_email} to report any problems or downtime.")).format(
tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(Text(settings.TECH_SUPPORT_EMAIL)) tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(Text(settings.TECH_SUPPORT_EMAIL))
)}</p> )}</p>
</section> </section>
</main>
lms/templates/static_templates/server-error.html
...@@ -6,7 +6,8 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -6,7 +6,8 @@ from openedx.core.djangolib.markup import Text, HTML
%> %>
<%inherit file="../main.html" /> <%inherit file="../main.html" />
<section class="outside-app"> <main id="main" aria-label="Content" tabindex="-1">
<section class="outside-app">
<h1> <h1>
${Text(_(u"There has been a 500 error on the {platform_name} servers")).format( ${Text(_(u"There has been a 500 error on the {platform_name} servers")).format(
platform_name=HTML("<em>{platform_name}</em>").format(platform_name=Text(static.get_platform_name())) platform_name=HTML("<em>{platform_name}</em>").format(platform_name=Text(static.get_platform_name()))
...@@ -19,4 +20,5 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -19,4 +20,5 @@ from openedx.core.djangolib.markup import Text, HTML
) )
)} )}
</p> </p>
</section> </section>
</main>
lms/templates/static_templates/server-overloaded.html
...@@ -5,7 +5,8 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -5,7 +5,8 @@ from openedx.core.djangolib.markup import Text, HTML
%> %>
<%inherit file="../main.html" /> <%inherit file="../main.html" />
<section class="outside-app"> <main id="main" aria-label="Content" tabindex="-1">
<section class="outside-app">
<h1> <h1>
${Text(_("Currently the {platform_name} servers are overloaded")).format( ${Text(_("Currently the {platform_name} servers are overloaded")).format(
platform_name=HTML("<em>{}</em>").format(platform_name=Text(settings.PLATFORM_NAME)) platform_name=HTML("<em>{}</em>").format(platform_name=Text(settings.PLATFORM_NAME))
...@@ -17,4 +18,5 @@ from openedx.core.djangolib.markup import Text, HTML ...@@ -17,4 +18,5 @@ from openedx.core.djangolib.markup import Text, HTML
tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(tech_support_email=Text(settings.TECH_SUPPORT_EMAIL)) tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(tech_support_email=Text(settings.TECH_SUPPORT_EMAIL))
)} )}
</p> </p>
</section> </section>
</main>
lms/templates/static_templates/tos.html
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<%block name="pagetitle">${_("Terms of Service")}</%block> <%block name="pagetitle">${_("Terms of Service")}</%block>
<section class="container about"> <main id="main" aria-label="Content" tabindex="-1">
<h1>${_("Terms of Service")}</h1> <section class="container about">
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p> <h1>${_("Terms of Service")}</h1>
</section> <p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
</main>
lms/templates/student_account/account_settings.html
...@@ -16,7 +16,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -16,7 +16,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
<%namespace name='static' file='/static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="pagetitle">${_("Account Settings")}</%block> <%block name="pagetitle">${_("Account Settings")}</%block>
<%block name="nav_skip">#content</%block>
% if duplicate_provider: % if duplicate_provider:
<section> <section>
......
lms/templates/student_account/account_settings.underscore
<main id="main" aria-label="Content" tabindex="-1">
<div class="account-settings-container"> <div class="account-settings-container">
<div class="wrapper-header"> <div class="wrapper-header">
<h2 class="header-title"><%- gettext("Account Settings") %></h2> <h2 class="header-title"><%- gettext("Account Settings") %></h2>
...@@ -22,3 +23,4 @@ ...@@ -22,3 +23,4 @@
<% }); %> <% }); %>
</div> </div>
</div> </div>
</main>
lms/templates/student_account/login_and_register.html
...@@ -33,5 +33,7 @@ ...@@ -33,5 +33,7 @@
</%block> </%block>
<div class="section-bkg-wrapper"> <div class="section-bkg-wrapper">
<main id="main" aria-label="Content" tabindex="-1">
<div id="login-and-registration-container" class="login-register" /> <div id="login-and-registration-container" class="login-register" />
</main>
</div> </div>
lms/templates/student_profile/learner_profile.html
...@@ -9,16 +9,17 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json ...@@ -9,16 +9,17 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json
%> %>
<%block name="pagetitle">${_("Learner Profile")}</%block> <%block name="pagetitle">${_("Learner Profile")}</%block>
<%block name="nav_skip">#content</%block>
<%block name="bodyclass">view-profile</%block> <%block name="bodyclass">view-profile</%block>
<div class="message-banner" aria-live="polite"></div> <div class="message-banner" aria-live="polite"></div>
<div class="wrapper-profile"> <main id="main" aria-label="Content" tabindex="-1">
<div class="wrapper-profile">
<div class="ui-loading-indicator"> <div class="ui-loading-indicator">
<p><span class="spin"><i class="icon fa fa-refresh" aria-hidden="true"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><i class="icon fa fa-refresh" aria-hidden="true"></i></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</div> </div>
</main>
<%block name="headextra"> <%block name="headextra">
<%static:css group='style-course'/> <%static:css group='style-course'/>
</%block> </%block>
......
lms/templates/wiki/article.html
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
{% block wiki_breadcrumbs %} {% block wiki_breadcrumbs %}
{% include "wiki/includes/breadcrumbs.html" %} {% include "wiki/includes/breadcrumbs.html" %}
{% endblock %} {% endblock %}
{% block nav_skip %}#main-article{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<div class="article-wrapper"> <div class="article-wrapper">
<article class="main-article" id="main-article" tabindex="-1"> <main id="main" aria-label="Content" tabindex="-1">
<article class="main-article" id="main-article">
{% if selected_tab != "edit" %} {% if selected_tab != "edit" %}
<h1>{{ article.current_revision.title }}</h1> <h1>{{ article.current_revision.title }}</h1>
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
{% wiki_render article %} {% wiki_render article %}
{% endblock %} {% endblock %}
</article> </article>
</main>
<div class="article-functions"> <div class="article-functions">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
......
lms/templates/wiki/base.html
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
{% endblock %} {% endblock %}
{% block nav_skip %}#wiki-content{% endblock %}
{% block body %} {% block body %}
{% if request.course %} {% if request.course %}
{% with course=request.course %} {% with course=request.course %}
...@@ -56,6 +54,7 @@ ...@@ -56,6 +54,7 @@
{% endwith %} {% endwith %}
{% endif %} {% endif %}
<main id="main" aria-label="Content" tabindex="-1">
<section class="container wiki {{ selected_tab }}" id="wiki-content"> <section class="container wiki {{ selected_tab }}" id="wiki-content">
<div class="wiki-wrapper"> <div class="wiki-wrapper">
{% block wiki_body %} {% block wiki_body %}
...@@ -77,5 +76,6 @@ ...@@ -77,5 +76,6 @@
</div> </div>
</section> </section>
</main>
{% endblock %} {% endblock %}
themes/edx.org/lms/templates/dashboard.html
...@@ -20,7 +20,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -20,7 +20,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
<%block name="pagetitle">${_("Dashboard")}</%block> <%block name="pagetitle">${_("Dashboard")}</%block>
<%block name="bodyclass">view-dashboard is-authenticated</%block> <%block name="bodyclass">view-dashboard is-authenticated</%block>
<%block name="nav_skip">#my-courses</%block>
<%block name="header_extras"> <%block name="header_extras">
% for template_name in ["donation"]: % for template_name in ["donation"]:
...@@ -77,7 +76,8 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -77,7 +76,8 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
</div> </div>
<section class="container dashboard" id="dashboard-main"> <section class="container dashboard" id="dashboard-main">
<section class="my-courses" id="my-courses" role="main" aria-label="Content" tabindex="-1"> <main id="main" aria-label="Content" tabindex="-1">
<section class="my-courses" id="my-courses">
<header class="wrapper-header-courses"> <header class="wrapper-header-courses">
<h2 class="header-courses">${_("My Courses")}</h2> <h2 class="header-courses">${_("My Courses")}</h2>
</header> </header>
...@@ -132,6 +132,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str ...@@ -132,6 +132,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
</div> </div>
% endif % endif
</section> </section>
</main>
% if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'):
<div id="dashboard-search-bar" class="search-bar dashboard-search-bar" role="search" aria-label="Dashboard"> <div id="dashboard-search-bar" class="search-bar dashboard-search-bar" role="search" aria-label="Dashboard">
......
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