Skip to content

Giulio/peer grading style release #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbau merged 2 commits into from
Jul 12, 2013
Merged

Giulio/peer grading style release #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
578f7ae
renamed tab, redisplayed legend and changed assessment type name to R…
caesar2164 Jul 12, 2013
1fa2a70
wording change for unknown answer checkbox text
caesar2164 Jul 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/lib/xmodule/xmodule/css/combinedopenended/display.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ section.legend-container {
width: 20%;
}
margin-bottom: 5px;
display: none !important;
}

section.combined-open-ended-status {
Expand Down
9 changes: 3 additions & 6 deletions common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,6 @@ class @PeerGradingProblem
# Callbacks for various events
#
##########

remove_answer_unknown: () =>
@answer_unknown_checkbox.removeAttr("checked")

remove_flag: () =>
@flag_student_checkbox.removeAttr("checked")
Expand Down Expand Up @@ -352,9 +349,9 @@ class @PeerGradingProblem
@grading_wrapper.attr('data-graded', graded) #just in case someone wants to read the DOM
message = "<p>Successfully saved your feedback. Fetched the next essay.</p>"
if graded >= required
message = "<p>Successfully saved your feedback. Fetched the next essay.
<b>You have completed the required number of peer evaluations, but may
choose to continue grading if you'd like.</b></p>"
message = "<p>Successfully saved your feedback. Fetched the next essay.</p>
<p><strong>You have completed the required number of peer evaluations, but may
choose to continue grading if you'd like.</strong></p>"
@grading_message.fadeIn()
@grading_message.html(message)
$.scrollTo(@grading_message)
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

HUMAN_TASK_TYPE = {
'selfassessment': "Self Assessment",
'openended': "edX Assessment",
'openended': "Reviewed Assessment",
}

# Default value that controls whether or not to skip basic spelling checks in the controller
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/peer_grading/peer_grading_problem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3>Written Feedback</h3>
<textarea name="feedback" placeholder="Feedback for student"
class="feedback-area" cols="70" ></textarea>
<div class="flag-student-container"> This submission has explicit or pornographic content : <input type="checkbox" class="flag-checkbox" value="student_is_flagged"> </div>
<div class="answer-unknown-container"> I do not know how to grade this question : <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown"></div>
<div class="answer-unknown-container"> I am uncomfortable with my choices above : <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown"></div>
</div>


Expand Down