Commit 9132009f by Dave St.Germain

Merge pull request #2463 from edx/dcs/a11y-progress-delistify

Converted <ol> to <div> to prevent a11y confusion on course progress page.
[LMS-1727]
parents 54f508a0 26068a98
div.profile-wrapper { .profile-wrapper {
color: #000; color: #000;
section.user-info { .user-info {
@extend .sidebar; @extend .sidebar;
border-left: 1px solid #d3d3d3; border-left: 1px solid #d3d3d3;
border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0;
...@@ -63,15 +63,15 @@ div.profile-wrapper { ...@@ -63,15 +63,15 @@ div.profile-wrapper {
} }
} }
div#description { #description {
font-size: 12px; font-size: 12px;
} }
a#change_language, #change_language,
a#change_location, #change_location,
a.edit-email, .edit-email,
a.name-edit, .name-edit,
a.email-edit { .email-edit {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
position: absolute; position: absolute;
...@@ -91,12 +91,12 @@ div.profile-wrapper { ...@@ -91,12 +91,12 @@ div.profile-wrapper {
margin-top: 4px; margin-top: 4px;
} }
a.deactivate { .deactivate {
color: #aaa; color: #aaa;
font-style: italic; font-style: italic;
} }
input#pwd_reset_button { #pwd_reset_button {
background: none; background: none;
border: none; border: none;
box-shadow: none; box-shadow: none;
...@@ -117,7 +117,7 @@ div.profile-wrapper { ...@@ -117,7 +117,7 @@ div.profile-wrapper {
} }
} }
div#change_password_pop { #change_password_pop {
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid #d3d3d3;
box-shadow: 0 1px 0 #eee; box-shadow: 0 1px 0 #eee;
color: #4D4D4D; color: #4D4D4D;
...@@ -132,7 +132,7 @@ div.profile-wrapper { ...@@ -132,7 +132,7 @@ div.profile-wrapper {
} }
} }
section.course-info { .course-info {
@extend .content; @extend .content;
header { header {
...@@ -148,18 +148,17 @@ div.profile-wrapper { ...@@ -148,18 +148,17 @@ div.profile-wrapper {
} }
} }
div#grade-detail-graph { #grade-detail-graph {
min-height: 400px; min-height: 400px;
width: 100%; width: 100%;
} }
> ol { > .chapters {
border-top: 1px solid #e3e3e3; border-top: 1px solid #e3e3e3;
list-style: none;
margin-top: lh(); margin-top: lh();
padding-left: 0; padding-left: 0;
> li { > section {
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
display: table; display: table;
...@@ -182,13 +181,12 @@ div.profile-wrapper { ...@@ -182,13 +181,12 @@ div.profile-wrapper {
width: flex-grid(2, 9); width: flex-grid(2, 9);
} }
ol.sections { .sections {
display: table-cell; display: table-cell;
list-style: none;
padding-left: flex-gutter(9); padding-left: flex-gutter(9);
width: flex-grid(7, 9); width: flex-grid(7, 9);
> li { > div {
padding:0 0 lh() 0; padding:0 0 lh() 0;
&:first-child { &:first-child {
...@@ -214,7 +212,7 @@ div.profile-wrapper { ...@@ -214,7 +212,7 @@ div.profile-wrapper {
font-size: em(14); font-size: em(14);
} }
section.scores { .scores {
margin: lh(.5) 0; margin: lh(.5) 0;
h3 { h3 {
......
...@@ -29,10 +29,10 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", ...@@ -29,10 +29,10 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
<%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='progress'" /> <%include file="/courseware/course_navigation.html" args="active_page='progress'" />
<section class="container"> <div class="container">
<div class="profile-wrapper"> <div class="profile-wrapper">
<section class="course-info"> <div class="course-info">
<header> <header>
<h1>${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email)}</h1> <h1>${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email)}</h1>
</header> </header>
...@@ -41,15 +41,15 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", ...@@ -41,15 +41,15 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
<div id="grade-detail-graph" aria-hidden="true"></div> <div id="grade-detail-graph" aria-hidden="true"></div>
%endif %endif
<ol class="chapters"> <div class="chapters">
%for chapter in courseware_summary: %for chapter in courseware_summary:
%if not chapter['display_name'] == "hidden": %if not chapter['display_name'] == "hidden":
<li> <section>
<h2>${ chapter['display_name'] }</h2> <h2>${ chapter['display_name'] }</h2>
<ol class="sections"> <div class="sections">
%for section in chapter['sections']: %for section in chapter['sections']:
<li> <div>
<% <%
earned = section['section_total'].earned earned = section['section_total'].earned
total = section['section_total'].possible total = section['section_total'].possible
...@@ -61,8 +61,9 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", ...@@ -61,8 +61,9 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
%if total > 0 or earned > 0: %if total > 0 or earned > 0:
<span class="sr"> <span class="sr">
${_("{earned:.3n} of {total:.3n} possible points").format( earned = float(earned), total = float(total) )} ${_("{earned:.3n} of {total:.3n} possible points").format( earned = float(earned), total = float(total) )}
</span></a> </span>
%endif %endif
</a>
%if total > 0 or earned > 0: %if total > 0 or earned > 0:
<span> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</span> <span> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</span>
%endif %endif
...@@ -81,7 +82,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", ...@@ -81,7 +82,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
%endif %endif
</p> </p>
<section class="scores"> <div class="scores">
%if len(section['scores']) > 0: %if len(section['scores']) > 0:
<h3> ${ _("Problem Scores: ") if section['graded'] else _("Practice Scores: ")} </h3> <h3> ${ _("Problem Scores: ") if section['graded'] else _("Practice Scores: ")} </h3>
<ol> <ol>
...@@ -92,17 +93,17 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", ...@@ -92,17 +93,17 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
%else: %else:
<h3 class="no-scores"> ${_("No problem scores in this section")} </h3> <h3 class="no-scores"> ${_("No problem scores in this section")} </h3>
%endif %endif
</section> </div>
</li> <!--End section--> </div> <!--End section-->
%endfor %endfor
</ol> <!--End sections--> </div> <!--End sections-->
</li> <!--End chapter--> </section> <!--End chapter-->
%endif %endif
%endfor %endfor
</ol> <!--End chapters--> </div> <!--End chapters-->
</section> </div>
</div> </div>
</section> </div>
...@@ -110,10 +110,10 @@ ...@@ -110,10 +110,10 @@
<%include file="${header_file}" /> <%include file="${header_file}" />
%endif %endif
<section class="content-wrapper" id="content"> <div class="content-wrapper" id="content">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
</section> </div>
% if not suppress_toplevel_navigation: % if not suppress_toplevel_navigation:
<%include file="${footer_file}" /> <%include file="${footer_file}" />
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
<body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}"> <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
<a class="nav-skip" href="#content">{% trans "Skip to this view's content" %}</a> <a class="nav-skip" href="#content">{% trans "Skip to this view's content" %}</a>
{% include "navigation.html" %} {% include "navigation.html" %}
<section class="content-wrapper" id="content"> <div class="content-wrapper" id="content">
{% block body %}{% endblock %} {% block body %}{% endblock %}
{% block bodyextra %}{% endblock %} {% block bodyextra %}{% endblock %}
</section> </div>
{% include "footer.html" %} {% include "footer.html" %}
......
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