Commit Graph

80 Commits

Author SHA1 Message Date
Adeel Khan
632bee5177 Fix edx templates.
PROD-465
2019-07-25 10:44:37 +05:00
Adeel Khan
30d8dfb5dd Fix edx-platform templates for xss.
This is part 2 of a multiple PR to escape
edx-platform templates to prevent xss attack.

PROD-465
2019-07-10 13:31:02 +05:00
Alison Hodges
f4209803f2 Remove "instructor" label or change to "Admin"
Clarifies what the roles are, makes Studio and LMS naming parallel.
2015-06-29 17:03:18 -04:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates
[LMS-11372]
[LMS-11370]
2014-10-01 10:26:52 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
Calen Pennington
d5029abfdc Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/templates.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:49:55 -04:00
Adam Palay
013549a39e removes unsure button (ORA-254) 2014-01-17 14:41:54 -05:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -05:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Stephen Sanchez
f4e95c6a7f Fix typo in peer grading messages. 2013-12-16 10:24:19 -05:00
Adam Palay
76c8a7a38d add all clear message 2013-12-05 14:57:36 -05:00
Adam Palay
9d48bb0ef1 removes temporary error messages 2013-12-05 12:08:39 -05:00
Adam Palay
a458b469d1 modify partial recovery message 2013-12-04 21:26:45 -05:00
Calen Pennington
b9926a2fd3 Add message explaining partial recovery 2013-12-04 16:42:57 -05:00
Adam Palay
175e1aab9e adds more temporary error messages 2013-12-04 14:30:09 -05:00
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