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
31aa776e
Commit
31aa776e
authored
Apr 10, 2017
by
Brian Jacobel
Committed by
Diana Huang
Apr 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Begin client-side date processing using DateutilFactory
parent
cca52b90
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
+9
-5
openedx/features/course_experience/views/course_outline.py
+0
-6
No files found.
openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
View file @
31aa776e
...
...
@@ -49,14 +49,14 @@ from django.utils.translation import ugettext as _
## Proctoring exposes a exam status message field as well as a status icon
<
%
if
subsection
.
get
('
due
')
is
None:
data_string =
subsection
['format']
data_string =
subsection
.get('format')
else:
if
'
special_exam
'
in
subsection:
data_string =
_('due
{
date
}')
else:
data_string =
_("{subsection_format}
due
{{
date
}}").
format
(
subsection_format=
subsection
['format']
)
data_string =
_("{subsection_format}
due
{{
date
}}").
format
(
subsection_format=
subsection
.get('format')
)
%
>
% if subsection
['format'] or due_date
or 'special_exam' in subsection:
% if subsection
.get('format')
or 'special_exam' in subsection:
<span
class=
"subtitle"
>
% if 'special_exam' in subsection:
## Display the proctored exam status icon and status message
...
...
@@ -73,7 +73,7 @@ from django.utils.translation import ugettext as _
% if not subsection['special_exam'].get('in_completed_state', False):
<span
class=
"localized-datetime subtitle-name"
data-datetime=
"${subsection
['due']
}"
data-datetime=
"${subsection
.get('due')
}"
data-string=
"${data_string}"
data-timezone=
"${user_timezone}"
data-language=
"${user_language}"
...
...
@@ -84,7 +84,7 @@ from django.utils.translation import ugettext as _
## this is the standard case in edx-platform
<span
class=
"localized-datetime subtitle-name"
data-datetime=
"${subsection
['due']
}"
data-datetime=
"${subsection
.get('due')
}"
data-string=
"${data_string}"
data-timezone=
"${user_timezone}"
data-language=
"${user_language}"
...
...
@@ -120,3 +120,7 @@ from django.utils.translation import ugettext as _
% endfor
</ol>
</div>
<
%
static:require_module_async
module_name=
"js/dateutil_factory"
class_name=
"DateUtilFactory"
>
DateUtilFactory.transform('.localized-datetime');
</
%
static:require
_module_async
>
openedx/features/course_experience/views/course_outline.py
View file @
31aa776e
...
...
@@ -30,12 +30,6 @@ class CourseOutlineFragmentView(EdxFragmentView):
child_id
=
block
[
'children'
][
i
]
child_detail
=
self
.
populate_children
(
all_blocks
[
child_id
],
all_blocks
,
course_position
)
# Fake data; remove
child_detail
=
dict
(
child_detail
,
**
{
"format"
:
""
,
"due"
:
""
})
block
[
'children'
][
i
]
=
child_detail
block
[
'children'
][
i
][
'current'
]
=
course_position
==
child_detail
[
'block_id'
]
...
...
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