Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
89fc9fb3
Commit
89fc9fb3
authored
Apr 11, 2017
by
Brian Jacobel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement minor UI/A11Y fixes for outline
parent
c4f0a89d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
22 deletions
+45
-22
common/test/acceptance/pages/lms/course_home.py
+1
-1
lms/static/sass/features/_course-outline.scss
+16
-1
openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+25
-17
openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+3
-3
No files found.
common/test/acceptance/pages/lms/course_home.py
View file @
89fc9fb3
...
...
@@ -54,7 +54,7 @@ class CourseOutlinePage(PageObject):
url
=
None
SECTION_SELECTOR
=
'.outline-item.section:nth-of-type({0})'
SECTION_TITLES_SELECTOR
=
'.section-name
span
'
SECTION_TITLES_SELECTOR
=
'.section-name
h3
'
SUBSECTION_SELECTOR
=
SECTION_SELECTOR
+
' .subsection:nth-of-type({1}) .outline-item'
SUBSECTION_TITLES_SELECTOR
=
SECTION_SELECTOR
+
' .subsection .subsection-title'
OUTLINE_RESUME_COURSE_SELECTOR
=
'.outline-item .resume-right'
...
...
lms/static/sass/features/_course-outline.scss
View file @
89fc9fb3
...
...
@@ -21,7 +21,11 @@
.section-name
{
@include
margin
(
0
,
0
,
(
$baseline
/
2
)
,
(
$baseline
/
2
));
padding
:
0
;
font-weight
:
bold
;
h3
{
font-weight
:
bold
;
margin
:
0
;
}
}
.outline-item
{
...
...
@@ -37,10 +41,16 @@
a
.outline-item
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
padding
:
(
$baseline
/
2
);
.subsection-title
{
margin
:
0
;
}
&
:hover
{
background-color
:
palette
(
primary
,
x-back
);
border-radius
:
$btn-border-radius
;
}
.subsection-text
{
...
...
@@ -61,6 +71,11 @@
&
.current
{
border
:
1px
solid
$lms-active-color
;
border-radius
:
$btn-border-radius
;
.resume-right
{
@include
float
(
right
);
}
}
}
}
...
...
openedx/features/course_experience/templates/course_experience/course-home-fragment.html
View file @
89fc9fb3
...
...
@@ -5,6 +5,7 @@
<
%!
import
json
from
django
.
conf
import
settings
from
django
.
utils
.
translation
import
ugettext
as
_
from
django
.
template
.
defaultfilters
import
escapejs
from
django
.
core
.
urlresolvers
import
reverse
...
...
@@ -17,32 +18,39 @@ from openedx.core.djangolib.markup import HTML
<
%
block
name=
"content"
>
<div
class=
"course-view container"
id=
"course-container"
>
<header
class=
"page-header has-secondary"
>
<div
class=
"page-header-main"
>
<nav
aria-label=
"${_('Course Outline')}"
class=
"sr-is-focusable"
tabindex=
"-1"
>
<h2
class=
"hd hd-2 page-title"
>
${_('Course Outline')}
</h2>
</nav>
</div>
<div
class=
"page-header-secondary"
>
<div
class=
"form-actions"
>
<a
class=
"btn action-resume-course"
href=
"${reverse('courseware', kwargs={'course_id': unicode(course.id.to_deprecated_string())})}"
>
<a
class=
"btn action-show-bookmarks"
href=
"${reverse('openedx.course_bookmarks.home', args=[course.id])}"
>
${_("Bookmarks")}
</a>
<a
class=
"btn btn-brand action-resume-course"
href=
"${reverse('courseware', kwargs={'course_id': unicode(course.id.to_deprecated_string())})}"
>
% if has_visited_course:
${_("Resume Course")}
% else:
${_("Start Course")}
% endif
</a>
<a
class=
"btn action-show-bookmarks"
href=
"${reverse('openedx.course_bookmarks.home', args=[course.id])}"
>
${_("Bookmarks")}
</a>
</div>
<div
class=
"page-header-search"
>
<form
class=
"search-form"
role=
"search"
>
<label
class=
"field-label sr-only"
for=
"search"
id=
"search-hint"
>
${_('Search the course')}
</label>
<input
class=
"field-input input-text search-input"
type=
"search"
name=
"search"
id=
"search"
placeholder=
"${_('Search the course')}'"
/>
<button
class=
"btn btn-small search-btn"
type=
"button"
>
${_('Search')}
</button>
</form>
</div>
% if settings.FEATURES.get('ENABLE_COURSEWARE_SEARCH'):
<div
class=
"page-header-search"
>
<form
class=
"search-form"
role=
"search"
>
<label
class=
"field-label sr-only"
for=
"search"
id=
"search-hint"
>
${_('Search the course')}
</label>
<input
class=
"field-input input-text search-input"
type=
"search"
name=
"search"
id=
"search"
placeholder=
"${_('Search the course')}"
/>
<button
class=
"btn btn-small search-btn"
type=
"button"
>
${_('Search')}
</button>
</form>
</div>
% endif
</div>
</header>
<div
class=
"page-content"
>
...
...
openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
View file @
89fc9fb3
...
...
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext as _
CourseOutlineFactory('.block-tree');
</
%
static:require
_module_async
>
<
div
class=
"course-outline"
id=
"main"
tabindex=
"-1"
>
<
main
role=
"main"
class=
"course-outline"
id=
"main"
tabindex=
"-1"
>
<ol
class=
"block-tree"
role=
"tree"
>
% for section in blocks.get('children') or []:
<li
...
...
@@ -23,7 +23,7 @@ from django.utils.translation import ugettext as _
tabindex=
"0"
>
<div
class=
"section-name"
>
<
span>
${ section['display_name'] }
</span
>
<
h3>
${ section['display_name'] }
</h3
>
</div>
<ol
class=
"outline-item focusable"
role=
"group"
tabindex=
"0"
>
% for subsection in section.get('children') or []:
...
...
@@ -120,7 +120,7 @@ from django.utils.translation import ugettext as _
</li>
% endfor
</ol>
</
div
>
</
main
>
<
%
static:require_module_async
module_name=
"js/dateutil_factory"
class_name=
"DateUtilFactory"
>
DateUtilFactory.transform('.localized-datetime');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment