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
6813b27b
Commit
6813b27b
authored
Mar 11, 2014
by
Dave St.Germain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove coursename from page H1, and slightly improve sequence navigation
parent
28382316
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
34 deletions
+19
-34
common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+6
-8
common/lib/xmodule/xmodule/seq_module.py
+0
-1
common/templates/xblock_wrapper.html
+1
-1
lms/templates/courseware/courseware.html
+2
-2
lms/templates/navigation.html
+10
-22
No files found.
common/lib/xmodule/xmodule/js/src/sequence/display.coffee
View file @
6813b27b
...
...
@@ -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
)
=>
...
...
common/lib/xmodule/xmodule/seq_module.py
View file @
6813b27b
...
...
@@ -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
),
...
...
common/templates/xblock_wrapper.html
View file @
6813b27b
<div
class=
"${' '.join(classes)}"
${
data_attributes
}
tabindex=
"0"
>
<div
class=
"${' '.join(classes)}"
${
data_attributes
}
>
${content}
</div>
lms/templates/courseware/courseware.html
View file @
6813b27b
...
...
@@ -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>
<
%
block
name=
"nav_skip"
>
${"#seq_content" if section_title else "#course-content"}
</
%
block>
<
%
include
file=
"../discussion/_js_head_dependencies.html"
/>
...
...
@@ -182,7 +182,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
<div
class=
"container"
>
...
...
lms/templates/navigation.html
View file @
6813b27b
...
...
@@ -36,33 +36,21 @@ site_status_msg = get_site_status_msg(course_id)
% endif
</
%
block>
% if course:
<header
class=
"global slim"
aria-label=
"${_('Global Navigation')}"
>
% else:
<header
class=
"global"
aria-label=
"${_('Global Navigation')}"
>
% endif
<nav>
<h1
class=
"logo"
>
<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>
<header
class=
"global ${"
slim
"
if
course
else
""}"
aria-label=
"${_('Global Navigation')}"
>
<nav>
<h1
class=
"logo"
>
<a
href=
"${marketing_link('ROOT')}"
>
<
%
block
name=
"navigation_logo"
>
<img
src=
"${static.url(branding.get_logo_url())}"
alt=
"${platform_name()}"
/>
</
%
block>
</a>
</h1>
% 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
% if user.is_authenticated():
<ol
class=
"left nav-global authenticated"
>
<
%
block
name=
"navigation_global_links_authenticated"
>
% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
...
...
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