Skip to content

An assortment of small OE changes, both for ICE and standard #1158

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
caesar2164 merged 1 commit into from
Sep 27, 2013
Merged

An assortment of small OE changes, both for ICE and standard #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion lms/static/sass/course/_staff_grading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions 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 @@ -55,8 +55,8 @@ <h3>${_("Written Feedback")}</h3>
<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>
Expand All @@ -65,8 +65,9 @@ <h3>${_("Written Feedback")}</h3>
<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 />
Expand Down