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

Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui

Browse Source 
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	lms/static/sass/course/_staff_grading.scss
This commit is contained in:
Vik Paruchuri
2013-02-06 16:04:01 -05:00
parent 9e4e98ef74 cf81fb27e8
commit 48719a7a45
19 changed files with 228 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,9 @@
<p class="rubric-selection-container"></p>
<p class="score-selection-container">
</p>
<textarea name="feedback" placeholder="Feedback for student (optional)"
<h3>Written Feedback</h3>
<p>Please include some written feedback as well.</p>
<textarea name="feedback" placeholder="Feedback for student"
class="feedback-area" cols="70" ></textarea>
<p class="flag-student-container">Flag this submission for review by course staff (use if the submission contains inappropriate content): <input type="checkbox" class="flag-checkbox" value="student_is_flagged"></p>
</div>