Commit Graph

35 Commits

Author SHA1 Message Date
Adeel Khan
632bee5177 Fix edx templates.
PROD-465
2019-07-25 10:44:37 +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
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
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
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07: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
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
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
cbd0895aad Add in single peer grading problem view 2013-02-04 16:42:14 -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
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
Vik Paruchuri
8aa033f601 Add peer and staff grading required display, notifications 2013-01-15 15:40:23 -05:00
Vik Paruchuri
cc56e47633 Fix active page issue 2013-01-14 15:12:54 -05:00
Diana Huang
c0001597a3 Update some of the templates so that they don't break 2013-01-03 13:47:29 -05:00
Diana Huang
962d83d71b Display a message when there are no problems to grade 2013-01-03 13:00:02 -05:00
Diana Huang
c89ff2ac0e Basic peer grading view using mocks and some cleanup in
the peer grading service
2013-01-02 17:44:58 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages
and the problem list page
2013-01-02 15:01:59 -05:00
Diana Huang
deffa188ff Fix some minor problems and add new key for peer grading. 2013-01-02 09:43:21 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00