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

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

common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

@@ -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)

common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee

@@ -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()
\ No newline at end of file

lms/static/sass/course/_staff_grading.scss

@@ -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;
         }

lms/templates/peer_grading/peer_grading_problem.html

@@ -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 />