Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
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-ora2
Commits
cefcb85f
Commit
cefcb85f
authored
Feb 27, 2014
by
Stephen Sanchez
Committed by
Brian Talbot
Feb 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding collapse / expand functions to the javascript. Removing the collapsed templates.
parent
de44c159
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
20 deletions
+21
-20
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment_collapsed.html
+0
-6
apps/openassessment/xblock/peer_assessment_mixin.py
+0
-4
apps/openassessment/xblock/self_assessment_mixin.py
+0
-4
apps/openassessment/xblock/static/js/src/oa_base.js
+21
-2
apps/openassessment/xblock/submission_mixin.py
+0
-4
No files found.
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment_collapsed.html
deleted
100644 → 0
View file @
de44c159
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
{% block list_item %}
<li
id=
"openassessment__peer-assessment"
class=
"openassessment__steps__step step--peer-assessment is--collapsed ui-toggle-visibility"
>
{% endblock %}
{% block body %}
{% endblock %}
apps/openassessment/xblock/peer_assessment_mixin.py
View file @
cefcb85f
...
...
@@ -130,7 +130,3 @@ class PeerAssessmentMixin(object):
for
assessment
in
self
.
rubric_assessments
:
if
assessment
[
"name"
]
==
mixin_name
:
return
assessment
@XBlock.handler
def
render_peer_assessment_collapsed
(
self
,
data
,
suffix
=
''
):
return
self
.
render_assessment
(
"openassessmentblock/peer/oa_peer_assessment_collapsed.html"
)
apps/openassessment/xblock/self_assessment_mixin.py
View file @
cefcb85f
...
...
@@ -18,7 +18,3 @@ class SelfAssessmentMixin(object):
def
render_self_assessment
(
self
,
data
,
suffix
=
''
):
return
self
.
render_assessment
(
'openassessmentblock/self/oa_self_assessment.html'
)
@XBlock.handler
def
render_self_assessment_collapsed
(
self
,
data
,
suffix
=
''
):
return
self
.
render_assessment
(
"openassessmentblock/self/oa_self_assessment_collapsed.html"
)
apps/openassessment/xblock/static/js/src/oa_base.js
View file @
cefcb85f
...
...
@@ -8,6 +8,20 @@ function OpenAssessmentBlock(runtime, element) {
/* Sample Debug Console: http://localhost:8000/submissions/Joe_Bloggs/TestCourse/u_3 */
/*
* Utility functions
*/
function
collapse
(
element
)
{
element
.
removeClass
(
"is--expanded"
);
element
.
addClass
(
"is--collapsed"
);
}
function
expand
(
element
)
{
element
.
addClass
(
"is--collapsed"
);
element
.
removeClass
(
"is--expanded"
);
}
/*
* Submission Functions
*/
function
render_submissions
(
data
)
{
...
...
@@ -26,6 +40,7 @@ function OpenAssessmentBlock(runtime, element) {
render_peer_assessment
(
data
);
}
});
collapse
(
$
(
'#openassessment__response'
,
element
));
$
.
ajax
({
type
:
"POST"
,
url
:
renderSubmissionUrl
,
...
...
@@ -101,19 +116,23 @@ function OpenAssessmentBlock(runtime, element) {
$
.
ajax
({
type
:
"POST"
,
url
:
renderPeer
Collapse
Url
,
url
:
renderPeerUrl
,
success
:
function
(
data
)
{
$
(
'#openassessment__peer-assessment'
,
element
).
replaceWith
(
data
);
collapse
(
$
(
'#openassessment__peer-assessment'
,
element
));
}
});
$
.
ajax
({
type
:
"POST"
,
url
:
renderSelf
Collapse
Url
,
url
:
renderSelfUrl
,
success
:
function
(
data
)
{
$
(
'#openassessment__self-assessment'
,
element
).
replaceWith
(
data
);
collapse
(
$
(
'#openassessment__self-assessment'
,
element
));
}
});
});
}
/* END Javascript for OpenAssessmentXBlock. */
apps/openassessment/xblock/submission_mixin.py
View file @
cefcb85f
...
...
@@ -166,7 +166,3 @@ class SubmissionMixin(object):
path
=
'openassessmentblock/response/oa_response_closed.html'
return
self
.
render_assessment
(
path
,
context_dict
=
context
)
@XBlock.handler
def
render_submission_collapsed
(
self
,
data
,
suffix
=
''
):
return
self
.
render_assessment
(
"openassessmentblock/response/oa_response_collapsed.html"
)
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