Commit Graph

63 Commits

Author SHA1 Message Date
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
2013-09-27 11:29:06 -07:00
Giulio Gratta
68ce6ed1c8 Second batch of ORA UI fixes:
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
2013-09-26 09:26:35 -07:00
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
2013-09-15 09:49:28 -07:00
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -04:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Vik Paruchuri
f8b5e67363 Text and styling cleanup 2013-08-15 14:52:51 -04:00
marco
7865fbe0df cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style 2013-08-15 13:56:17 -04:00
marco
c9807db308 styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings. 2013-08-14 14:12:04 -04:00
marco
ab81000665 visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins. 2013-08-13 14:42:34 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution
fixes template errors

keep tos untranslated

formatting fixes
2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Vik Paruchuri
701bdc55c0 Minor fixes 2013-04-16 11:55:54 -04:00
Vik Paruchuri
9f04769c00 Better confirmation for flagging 2013-04-10 16:16:13 -04:00
Vik Paruchuri
a64d57ae1d Add popup when flag box is checked 2013-04-10 16:01:56 -04:00
Vik Paruchuri
9bc8dbd7ca Fix location strings, re-order checkboxes 2013-02-20 18:04:25 -05:00
Vik Paruchuri
ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:43:04 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
2013-02-20 11:20:10 -05:00
Vik Paruchuri
02b0bc2923 Add in answer unknown container/checkbox to pass back to controller 2013-02-13 15:37:42 -05:00
Diana Huang
7658cd7a50 Make the text on the peer grading closed page clearer 2013-02-12 11:10:59 -05:00
Vik Paruchuri
50ba024ae8 Add additional calibration interstitial page, add in message when calibration essay saved. 2013-02-09 10:43:40 -05:00
Vik Paruchuri
c195fe65cd Restyle rubric list, submission container 2013-02-07 11:10:29 -05:00
Diana Huang
97655d0358 Remove the requirement that the problem peer grading module
has to have a certain naming structure
2013-02-07 09:40:30 -05:00
Vik Paruchuri
48719a7a45 Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	lms/static/sass/course/_staff_grading.scss
2013-02-06 16:04:01 -05:00
Vik Paruchuri
9e4e98ef74 Fix some css to get things to properly close/open 2013-02-06 15:13:56 -05:00
Diana Huang
6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems
Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py
2013-02-06 14:16:18 -05:00
Vik Paruchuri
02ac72d0af Doing some restyling on peer grading 2013-02-06 13:49:59 -05:00
Diana Huang
042ae2da29 Fix some bugs with the grading module and make
the 'closed' page a little nicer
2013-02-06 12:51:52 -05:00
Diana Huang
78948210b8 Use different template when peer grading is closed. 2013-02-06 11:50:35 -05:00
Diana Huang
51db547a63 Merge branch 'master' into diana/rubric-ui-improvements
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -05:00
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
Vik Paruchuri
cbd0895aad Add in single peer grading problem view 2013-02-04 16:42:14 -05:00
Vik Paruchuri
6cf2742e32 Trim unneeded files 2013-02-04 14:22:57 -05:00
Vik Paruchuri
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Diana Huang
68fc794a97 Add in some better encouragement to write feedback 2013-02-01 15:15:42 -05:00
Vik Paruchuri
c1583dbba2 Properly load javascript, fix templates to work with xmodule, modify AJAX handlers 2013-01-31 19:57:35 -05:00
Vik Paruchuri
c2f644656d Fix HTML return 2013-01-31 19:12:49 -05:00
Vik Paruchuri
bdb82cda65 Strip out JS, old urls 2013-01-31 18:23:30 -05:00
Vik Paruchuri
5f538f078b Pass flag through from LMS to grading controller 2013-01-30 19:50:36 -05:00
Diana Huang
ba1cd8117f Rename 'Pending' column to something more descriptive 2013-01-22 10:33:07 -05:00
Diana Huang
60531e30fa Add progress bars to the staff grading and peer grading views. 2013-01-16 14:22:39 -05:00
Diana Huang
aec40ead57 Use tables to display problems instead of a simple list 2013-01-16 12:40:39 -05:00
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -05:00
Vik Paruchuri
8aa033f601 Add peer and staff grading required display, notifications 2013-01-15 15:40:23 -05:00
Diana Huang
77fe6ed452 Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:48:40 -05:00
Vik Paruchuri
301293f8b0 Remove debug statement, fix active page issue on problem page 2013-01-15 14:33:38 -05:00
Diana Huang
3d2ae66cf5 Refactor out rubric rendering and pass along
the right information for peer grading
2013-01-15 13:46:18 -05:00
Diana Huang
48be0b15a1 Clean up on staff grading code path and
the beginnings of peer grading.
2013-01-15 11:21:10 -05:00
Vik Paruchuri
cc56e47633 Fix active page issue 2013-01-14 15:12:54 -05:00
Diana Huang
c4d1b2e643 Use correct user id and make the reload button a back button 2013-01-09 14:41:23 -05:00