Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,819 Commits 1 Branch 0 Tags
e2bfcf2a36fb56fcbcd1f099aeef3debc19c9952
Commit Graph

63 Commits

Author SHA1 Message Date
Adam Palay
f1984e7a9f i18n open_ended_rubric (ORA-314) 
update strings
 2014-02-19 15:41:16 -05:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
David Baumgold
03d7d0e952 more i18n work 2013-12-05 14:03:02 -05:00
Vik Paruchuri
0accbaee07 Various open ended accessibility fixes 2013-10-11 15:00:55 -04:00
Vik Paruchuri
4ab47c4d05 Fix mako syntax in rubric template. 2013-09-27 15:57:41 -04: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
Giulio Gratta
78ea6ef030 conditionalize written feedback area. 2013-09-22 17:23:22 -07:00
Vik Paruchuri
d9ce5e073b Implement a save button for open ended responses 2013-09-20 16:35:10 -04:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Vik Paruchuri
f8b5e67363 Text and styling cleanup 2013-08-15 14:52:51 -04:00
Vik Paruchuri
a084d4486d Get rid of labels 2013-08-15 14:28:52 -04:00
Vik Paruchuri
ac4d312415 Make rubric text generic, fix right arrow 2013-08-15 14:26:42 -04:00
marco
72bb93d436 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-15 13:57:05 -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
Vik Paruchuri
6f657c1124 Import to fix internationalization 2013-08-15 10:30:16 -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
3a970d1490 restyled controls area for motion through multiple scored peer reviews 2013-08-13 20:56:53 -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
marco
910523eee5 merge conflicts resolved 2013-08-09 18:45:54 -04:00
marco
68199da821 added oe-tools header areas to eventually consolitate all messaging 2013-08-09 18:44:15 -04:00
Vik Paruchuri
6543343388 Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-09 14:51:13 -04:00
Vik Paruchuri
33da3ec1cf Fix self assessment template 2013-08-09 14:50:57 -04:00
marco
166c4c6939 cleaned up merge issue in combined_open_ended.html 2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item 2013-08-09 11:26:59 -04:00
Vik Paruchuri
687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
 2013-08-08 19:03:46 -04:00
Vik Paruchuri
a9926f0460 Display message to student when they cannot see their peer grading feedback yet. 2013-08-08 18:43:54 -04:00
Vik Paruchuri
900377e4ee Return written feedback 2013-08-08 17:53:29 -04:00
Vik Paruchuri
d44b2e62a0 Proper partial credit checks 2013-08-08 17:19:06 -04:00
Vik Paruchuri
15b0e12068 Remove progress indicators, make rubric display properly 2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244 Fix grading submitted messages 2013-08-08 13:31:43 -04:00
marco
3667fe8bd0 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-07 16:35:32 -04:00
marco
56dee21142 partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss 2013-08-07 16:35:14 -04:00
Vik Paruchuri
ea2b9191c1 Allow student to switch between rubrics, tell user once peer grading required amount is done 2013-08-02 15:30:17 -04:00
marco
478fa18beb merge edit cleanup, nothing new 2013-08-02 14:30:04 -04:00
Vik Paruchuri
aa09006247 Hide and show multiple rubrics 2013-08-02 13:53:07 -04:00
marco
ec99e20a35 styled rubric, dividers between sections 2013-08-02 13:37:53 -04:00
Vik Paruchuri
932bbd2592 Fix text issue 2013-08-02 13:23:03 -04:00
Vik Paruchuri
a939c152c8 Add in support for multiple rubrics 2013-08-02 12:56:31 -04:00
Vik Paruchuri
e2c4b5016a Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-02 12:13:02 -04:00
Vik Paruchuri
30e506777e Render multiple rubrics, collapse rubrics 2013-08-02 12:12:38 -04:00
marco
cc7c025478 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-02 00:57:50 -04:00
marco
0e8c29989c style cleanup for open ended assessments, cleaning up workflow header, style definitions for rubrics are commented out momentarily, and an open issue for unicode rendering on the show and hide prompt area still remains 2013-08-02 00:57:31 -04:00
Vik Paruchuri
178be44333 Remove legend, start to edit rubric 2013-08-01 16:25:21 -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
29bd64555f Get table to take up the width of the page 2013-07-25 15:30:11 -04:00
Vik Paruchuri
d23d354ab3 Change top text 2013-07-25 14:41:54 -04:00
Vik Paruchuri
172bc5cfa5 Change naming, edit border radius 2013-07-25 14:23:11 -04:00