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
282ded74
Commit
282ded74
authored
Nov 22, 2016
by
Albert St. Aubin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Addressed test failures and PR comments
TNL-5894
parent
cb22b909
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
16 deletions
+14
-16
common/test/acceptance/pages/lms/course_info.py
+1
-1
lms/djangoapps/courseware/tests/test_course_info.py
+3
-3
lms/djangoapps/courseware/tests/test_date_summary.py
+2
-2
lms/templates/courseware/course_updates.html
+2
-4
lms/templates/courseware/info.html
+6
-6
No files found.
common/test/acceptance/pages/lms/course_info.py
View file @
282ded74
...
@@ -20,7 +20,7 @@ class CourseInfoPage(CoursePage):
...
@@ -20,7 +20,7 @@ class CourseInfoPage(CoursePage):
"""
"""
Return the number of updates on the page.
Return the number of updates on the page.
"""
"""
return
len
(
self
.
q
(
css
=
'
section.updates section
article'
)
.
results
)
return
len
(
self
.
q
(
css
=
'
.updates .updates-
article'
)
.
results
)
@property
@property
def
handout_links
(
self
):
def
handout_links
(
self
):
...
...
lms/djangoapps/courseware/tests/test_course_info.py
View file @
282ded74
...
@@ -216,15 +216,15 @@ class CourseInfoTitleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
...
@@ -216,15 +216,15 @@ class CourseInfoTitleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
)
)
self
.
assertIn
(
self
.
assertIn
(
expected_title
,
expected_title
,
content
(
'
h1.page-title'
)
.
contents
()
content
(
'
.page-title'
)
.
contents
()[
0
]
)
)
self
.
assertIn
(
self
.
assertIn
(
expected_display_title
,
expected_display_title
,
display_content
(
'
h1.page-title'
)
.
contents
()
display_content
(
'
.page-title'
)
.
contents
()[
0
]
)
)
self
.
assertIn
(
self
.
assertIn
(
display_course
.
display_name_with_default
,
display_course
.
display_name_with_default
,
display_content
(
'
h2
.page-subtitle'
)
.
contents
()
display_content
(
'.page-subtitle'
)
.
contents
()
)
)
...
...
lms/djangoapps/courseware/tests/test_date_summary.py
View file @
282ded74
...
@@ -180,7 +180,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
...
@@ -180,7 +180,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
self
.
client
.
login
(
username
=
'mrrobot'
,
password
=
'test'
)
self
.
client
.
login
(
username
=
'mrrobot'
,
password
=
'test'
)
html_elements
=
[
html_elements
=
[
'<h
1 class="handouts-header">Important Course Dates</h1
>'
,
'<h
4 class="handouts-header">Important Course Dates</h4
>'
,
'<div class="date-summary-container">'
,
'<div class="date-summary-container">'
,
'<div class="date-summary date-summary-todays-date">'
,
'<div class="date-summary date-summary-todays-date">'
,
'<h3 class="heading localized-datetime"'
,
'<h3 class="heading localized-datetime"'
,
...
@@ -202,7 +202,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
...
@@ -202,7 +202,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
response
=
self
.
client
.
get
(
url
)
response
=
self
.
client
.
get
(
url
)
html_elements
=
[
html_elements
=
[
'<h
1 class="handouts-header">Important Course Dates</h1
>'
,
'<h
4 class="handouts-header">Important Course Dates</h4
>'
,
'<div class="date-summary-container">'
,
'<div class="date-summary-container">'
,
'<div class="date-summary date-summary-todays-date">'
,
'<div class="date-summary date-summary-todays-date">'
,
'<h3 class="heading localized-datetime"'
,
'<h3 class="heading localized-datetime"'
,
...
...
lms/templates/courseware/course_updates.html
View file @
282ded74
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<div>
<div
class=
"recent-updates"
>
<div
class=
"recent-updates"
>
% for index, update in enumerate(visible_updates):
% for index, update in enumerate(visible_updates):
<article
class=
"updates-article"
>
<article
class=
"updates-article"
>
% if not update.get("is_error"):
% if not update.get("is_error"):
<
div
class=
"date"
id=
"msg-date-${index}"
>
${update.get("date")}
</div>
<
h5
class=
"date"
id=
"msg-date-${index}"
>
${update.get("date")}
</h5>
<button
<button
class=
"toggle-visibility-button"
class=
"toggle-visibility-button"
data-hide=
"${_('Hide')}"
data-hide=
"${_('Hide')}"
...
@@ -34,7 +33,7 @@
...
@@ -34,7 +33,7 @@
<div
class=
"old-updates hidden toggle-visibility-element"
id=
"old-updates"
>
<div
class=
"old-updates hidden toggle-visibility-element"
id=
"old-updates"
>
% for index, update in enumerate(hidden_updates):
% for index, update in enumerate(hidden_updates):
<article
class=
"updates-article"
>
<article
class=
"updates-article"
>
<
div
class=
"date"
id=
"msg-date-${index + len(visible_updates)}"
>
${update.get("date")}
</div
>
<
h5
class=
"date"
id=
"msg-date-${index + len(visible_updates)}"
>
${update.get("date")}
</h5
>
<button
<button
class=
"toggle-visibility-button"
class=
"toggle-visibility-button"
data-hide=
"${_('Hide')}"
data-hide=
"${_('Hide')}"
...
@@ -47,4 +46,3 @@
...
@@ -47,4 +46,3 @@
</article>
</article>
% endfor
% endfor
</div>
</div>
<div>
lms/templates/courseware/info.html
View file @
282ded74
...
@@ -91,10 +91,11 @@ from openedx.core.djangolib.markup import HTML, Text
...
@@ -91,10 +91,11 @@ from openedx.core.djangolib.markup import HTML, Text
</div>
</div>
% endif
% endif
</section>
</section>
<section
aria-label=
"${_('Handout Navigation')}"
class=
"handouts"
>
<section
aria-label=
"${_('Handout Navigation')}"
class=
"handouts"
>
% if SelfPacedConfiguration.current().enable_course_home_improvements:
% if SelfPacedConfiguration.current().enable_course_home_improvements:
<h4
class=
"handouts-header"
>
${_("Important Course Dates")}
</h1
>
<h4
class=
"handouts-header"
>
${_("Important Course Dates")}
</h4
>
## Should be organized by date, last date appearing at the bottom
## Should be organized by date, last date appearing at the bottom
% for course_date in get_course_date_blocks(course, user):
% for course_date in get_course_date_blocks(course, user):
...
@@ -122,20 +123,19 @@ from openedx.core.djangolib.markup import HTML, Text
...
@@ -122,20 +123,19 @@ from openedx.core.djangolib.markup import HTML, Text
</div>
</div>
% endfor
% endfor
% endif
% endif
<h1
class=
"handouts-header"
>
${_(course.info_sidebar_name)}
</h1
>
<h4
class=
"handouts-header"
>
${_(course.info_sidebar_name)}
</h4
>
${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
</section>
</section>
% else:
% else:
<section
class=
"updates"
>
<section
class=
"updates"
>
<h
1
class=
"handouts-header"
>
${_("Course Updates and News")}
</h1
>
<h
4
class=
"handouts-header"
>
${_("Course Updates and News")}
</h4
>
${HTML(get_course_info_section(request, masquerade_user, course, 'guest_updates'))}
${HTML(get_course_info_section(request, masquerade_user, course, 'guest_updates'))}
</section>
</section>
<section
aria-label=
"${_('Handout Navigation')}"
class=
"handouts"
>
<section
aria-label=
"${_('Handout Navigation')}"
class=
"handouts"
>
<h
1
class=
"handouts-header"
>
${_("Course Handouts")}
</h1
>
<h
4
class=
"handouts-header"
>
${_("Course Handouts")}
</h4
>
${HTML(get_course_info_section(request, masquerade_user, course, 'guest_handouts'))}
${HTML(get_course_info_section(request, masquerade_user, course, 'guest_handouts'))}
</section>
</section>
% endif
<!-- if course authenticated -->
% endif
</div>
</div>
</div>
</div>
</main>
</main>
...
...
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