Skip to content

E
edx-platform
Commit 00b41439 by Giulio Gratta Committed by Joe Blaylock
Options

fix ICE legend, add space to "offensive" checkbox, and fix undo

parent 07dc7ae0
Showing with 6 additions and 4 deletions
common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
...@@ -56,7 +56,7 @@ class @TrackChanges ...@@ -56,7 +56,7 @@ class @TrackChanges
key = parseInt(@attr('data-cid')) key = parseInt(@attr('data-cid'))
if key > keyToUndo if key > keyToUndo
keyToUndo = key keyToUndo = key
ICEtracker.rejectChange('[data-cid="'+ keyToUndo + '"]') @tracker.rejectChange('[data-cid="'+ keyToUndo + '"]')
stop_tracking_on_submit: () => stop_tracking_on_submit: () =>
@tracker.stopTracking() @tracker.stopTracking()
\ No newline at end of file
lms/static/sass/course/_staff_grading.scss
...@@ -18,7 +18,7 @@ div.peer-grading{ ...@@ -18,7 +18,7 @@ div.peer-grading{
overflow: auto; overflow: auto;
} }
div.feedback-area.track-changes, p.legend { div.feedback-area.track-changes, p.ice-legend {
.ice-controls { .ice-controls {
float: right; float: right;
} }
......
lms/templates/peer_grading/peer_grading_problem.html
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
<span class="del">${_("This is a deletion.")}</span>&nbsp; <span class="del">${_("This is a deletion.")}</span>&nbsp;
<span class="ins">${_("[This is a comment.]")}</span>&nbsp; <span class="ins">${_("[This is a comment.]")}</span>&nbsp;
<span class="ice-controls"> <span class="ice-controls">
<a href="#" class="undo-change"><i class="icon-undo"></i> Undo Change</a>&nbsp;&nbsp;
<a href="#" class="reset-changes"><i class="icon-refresh"></i> Reset Changes</a> <a href="#" class="reset-changes"><i class="icon-refresh"></i> Reset Changes</a>
<a href="#" class="undo-change"><i class="icon-undo"></i> Undo Change</a>
</span> </span>
</p> </p>
<div name="feedback" class="feedback-area track-changes" contenteditable="true"></div> <div name="feedback" class="feedback-area track-changes" contenteditable="true"></div>
...@@ -65,8 +65,9 @@ ...@@ -65,8 +65,9 @@
<textarea name="feedback" placeholder="Feedback for student" class="feedback-area" cols="70" ></textarea> <textarea name="feedback" placeholder="Feedback for student" class="feedback-area" cols="70" ></textarea>
% endif % endif
<div class="flag-student-container"> <div class="flag-student-container">
<br />
<input type="checkbox" class="flag-checkbox" value="student_is_flagged"> <input type="checkbox" class="flag-checkbox" value="student_is_flagged">
${_("This submission has explicit, offensive, or (I suspect) plagiarized content: ")} ${_("This submission has explicit, offensive, or (I suspect) plagiarized content. ")}
</div> </div>
</div> </div>
<hr /> <hr />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment