Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1158 from edx/giulio/small-oe-fixes

Browse Source 
An assortment of small OE changes, both for ICE and standard
This commit is contained in:
Giulio Gratta
2013-09-27 11:29:26 -07:00
parent eebc524cde d75cdda064
commit abfb33c3e5
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View File

@@ -353,7 +353,7 @@ class @CombinedOpenEnded
@save_button.attr("disabled",true)
$.postWithPrefix "#{@ajax_url}/store_answer", data, (response) =>
if response.success
@gentle_alert("Answer saved.")
@gentle_alert("Answer saved, but not yet submitted.")
else
@errors_area.html(response.error)
@save_button.attr("disabled",false)

2
common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
View File

@@ -56,7 +56,7 @@ class @TrackChanges
key = parseInt(@attr('data-cid'))
if key > keyOfLatestChange
keyOfLatestChange = key
ICEtracker.rejectChange('[data-cid="'+ keyOfLatestChange + '"]')
@tracker.rejectChange('[data-cid="'+ keyOfLatestChange + '"]')
stop_tracking_on_submit: () =>
@tracker.stopTracking()

2
lms/static/sass/course/_staff_grading.scss
View File

@@ -18,7 +18,7 @@ div.peer-grading{
overflow: auto;
}
div.feedback-area.track-changes, p.legend {
div.feedback-area.track-changes, p.ice-legend {
.ice-controls {
float: right;
}

5
lms/templates/peer_grading/peer_grading_problem.html
View File

@@ -55,8 +55,8 @@
<span class="del">${_("This is a deletion.")}</span>&nbsp;
<span class="ins">${_("[This is a comment.]")}</span>&nbsp;
<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="undo-change"><i class="icon-undo"></i> Undo Change</a>
</span>
</p>
<div name="feedback" class="feedback-area track-changes" contenteditable="true"></div>
@@ -65,8 +65,9 @@
<textarea name="feedback" placeholder="Feedback for student" class="feedback-area" cols="70" ></textarea>
% endif
<div class="flag-student-container">
<br />
<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>
<hr />