Commit Graph

7057 Commits

Author SHA1 Message Date
Arthur Barrett
7e7911a08d Changed the markup and js for associating spans with discussion threads. Uses the discussion id now. 2013-02-12 13:24:50 -05:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00
Arthur Barrett
cfa16feab5 Trying to setup jasmine specs... 2013-02-12 12:00:54 -05:00
Diana Huang
d45c539c6d Make the peer grading due date a property of the problem
metadata, not the peer grading module metadata.
2013-02-12 10:49:06 -05:00
Chris Dodge
93d186511f clean up templates that were removed from disk - we need to remove from DB as well 2013-02-12 10:23:32 -05:00
Vik Paruchuri
65cb53b8a6 Revert logsettings 2013-02-11 19:21:22 -05:00
Vik Paruchuri
e1b2481c38 Fix remaining path issues 2013-02-11 19:08:53 -05:00
Vik Paruchuri
bdc5910cbb Fix import paths to point to xmodule, remove old JS resource strings 2013-02-11 19:03:18 -05:00
Vik Paruchuri
b5bac1e3c1 Fix some path issues in import statements 2013-02-11 18:47:01 -05:00
Vik Paruchuri
b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports 2013-02-11 18:43:47 -05:00
Vik Paruchuri
c2b32b7038 Fix location that is queried on 2013-02-11 18:23:01 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
323caeb744 Properly pass around S3 interface 2013-02-11 17:58:19 -05:00
Victor Shnayder
75898bfe1a tell collectstatic not to mess with protex--it relies on the filename 2013-02-11 17:54:54 -05:00
Vik Paruchuri
01e8fe8d08 Pass S3 interface in module_render 2013-02-11 17:54:37 -05:00
Vik Paruchuri
120c0e139e Remove url element from parent class to avoid annoying errors 2013-02-11 17:38:25 -05:00
Vik Paruchuri
0f71f5b92e Finish settings refactor 2013-02-11 17:36:33 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Arthur Barrett
a144896154 Style and behavior changes to the header and tooltips. 2013-02-11 16:17:34 -05:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
add exporting of grading_policy.json
2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
Arthur Barrett
3a81ed0651 Updated styling and markup. 2013-02-10 19:40:18 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Arthur Barrett
b7158e9f8a Switched to $.scrollTo instead of custom animation and refactored toggle method. 2013-02-09 14:38:04 -05:00
Vik Paruchuri
2523c1e189 Slight visual tweaks 2013-02-09 12:40:11 -05:00
Vik Paruchuri
e68103f3e7 Render results at needed times 2013-02-09 11:24:29 -05:00
Vik Paruchuri
add3aa90e1 Fix peer grading interface transitions (reset feedback box, change message) 2013-02-09 11:01:34 -05:00
Vik Paruchuri
d6a2148bfb Clean up message and calibration page 2013-02-09 10:47:14 -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
67e364fa70 Fix spacing, slightly prune CSS 2013-02-09 09:13:21 -05:00
Vik Paruchuri
e8cb3590b1 Trim hint and submit messages out of self assessment 2013-02-09 09:06:14 -05:00
Vik Paruchuri
ae1df0108c Remove save successful message 2013-02-09 09:00:43 -05:00
Vik Paruchuri
6d0af13923 Fix respond to feedback 2013-02-09 08:46:24 -05:00
Vik Paruchuri
3eb18a9ebc Fix status display/make it more robust, and fix module render error 2013-02-09 08:17:20 -05:00
Vik Paruchuri
85324ec83f Restyle creates a combined results view 2013-02-09 01:35:55 -05:00
Vik Paruchuri
e566005b5a Add in feedback dict and render the feedback table with it 2013-02-09 01:17:54 -05:00
Vik Paruchuri
a7a55e462d Create a combined results view 2013-02-09 01:11:21 -05:00
Vik Paruchuri
4421e09dda Pass through feedback dict, grader ids, submission ids 2013-02-09 00:49:14 -05:00
Vik Paruchuri
757ff604bf Start to abstract away rendering of feedback from the open ended module into the combined module 2013-02-09 00:44:50 -05:00
Vik Paruchuri
4dc0859fbd Finish refactor of rubric templates, redo some margins 2013-02-09 00:30:25 -05:00
Vik Paruchuri
efe5e491ef Separate rubric rendering 2013-02-09 00:19:34 -05:00
Vik Paruchuri
0feb8f66bc Fix colors on legend, add random assessment 2013-02-08 23:59:39 -05:00
Vik Paruchuri
8ef45915df Move legend and status around to find optimal placements 2013-02-08 23:52:44 -05:00
Vik Paruchuri
dbfc77e4a5 Add in legend, move status bar, fix js where it was constantly displaying a message 2013-02-08 23:37:03 -05:00
Vik Paruchuri
70f7185723 Make a legend 2013-02-08 23:27:45 -05:00
Vik Paruchuri
5ac6fad1f7 Properly display rubric scores at all times 2013-02-08 23:16:44 -05:00
Vik Paruchuri
8bfad8f2bd Work on properly displaying rubric icons 2013-02-08 23:11:51 -05:00
Vik Paruchuri
35babcf592 Properly show status on combined rubric 2013-02-08 22:55:20 -05:00
Vik Paruchuri
0c6ac1c743 Add in BC 2013-02-08 22:43:38 -05:00