Commit Graph

583 Commits

Author SHA1 Message Date
Diana Huang
b5f3386d27 Add breadcrumbing and clarify some of the text on the
instructor grading interface.
2012-12-07 17:01:27 -05:00
Diana Huang
5914b1cf91 Make the mock backend support different problems, and make sure
the location is passed around properly. Clarify some of the numbers for
the user
2012-12-07 17:01:26 -05:00
Diana Huang
94e1a9ffd3 Clean up some minor issues with list view
and display some new information on the problem-specific page
2012-12-07 17:01:26 -05:00
Diana Huang
48b9043213 Initial problem list functionality 2012-12-07 17:01:26 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
2012-12-07 11:17:41 -05:00
Diana Huang
5ebde2a93e fix comment 2012-12-05 09:42:30 -05:00
Diana Huang
cb6bb38f84 merge commit 2012-12-05 09:40:53 -05:00
Diana Huang
90076c39e6 add in some new mock responses for our staff grading API 2012-12-05 09:25:05 -05:00
Victor Shnayder
40f34d19a3 add initial mock of get_problems call 2012-12-04 17:46:34 -05:00
Victor Shnayder
c57b9f3240 merge prompt and ml accuracy display 2012-12-04 14:44:23 -05:00
David Ormsbee
3b326048f9 Don't log errors to console if there is no console (like IE8 and below). 2012-12-01 12:16:10 -05:00
Vik Paruchuri
4e4bd4aba2 Altered staff grading to display message about ml grading performance. 2012-11-30 15:52:11 -05:00
Victor Shnayder
26f033b79f allow score 0 2012-11-30 10:03:31 -05:00
Victor Shnayder
d2cc8696ed Add some initial css. 2012-11-30 10:03:31 -05:00
Victor Shnayder
d1b433dba5 add adaptive-max-score html to lms view 2012-11-30 10:03:30 -05:00
Victor Shnayder
a584f06bac Add support for varying max_score. 2012-11-30 10:03:30 -05:00
Victor Shnayder
d0e2b85e3c Refactor testing code, hook up frontend.
- now getting requests from js to server and back, with mocked service.
2012-11-30 10:02:20 -05:00
Victor Shnayder
4f359ea594 pass through message when no more submissions. 2012-11-30 09:51:35 -05:00
Victor Shnayder
5836438454 hook up radio buttons, hide submit button till after grading 2012-11-30 09:51:35 -05:00
Victor Shnayder
e910f60e08 wip 2012-11-30 09:51:35 -05:00
Victor Shnayder
e1fd6d73b3 refactor to be more clearly model-view 2012-11-30 09:51:34 -05:00
Victor Shnayder
b1d5273a2a add messages, headers for sections 2012-11-30 09:51:34 -05:00
Victor Shnayder
546096e8a0 Split out mock backend, fix out-of-data bug 2012-11-30 09:51:34 -05:00
Victor Shnayder
3d0ef75807 Basic js implementation, with mocked backend 2012-11-30 09:51:34 -05:00
Victor Shnayder
aa786d138d move computers--adding test file 2012-11-30 09:51:34 -05:00
Victor Shnayder
c7ab37bdab initial js--called at page load 2012-11-30 09:51:34 -05:00
Victor Shnayder
7d1d135c16 Wire in some initial js. 2012-11-30 09:51:34 -05:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids
Hotfix/arjun/fix integer disc ids
2012-10-12 11:38:28 -07:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Arjun Singh
6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved 2012-10-12 04:22:27 -07:00
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Arjun Singh
8fb6204073 Better fix for trailing slash 2012-09-21 05:42:51 -07:00
Arjun Singh
663e38aa1f New URLs require a trailing slash 2012-09-21 05:19:23 -07:00
Ibrahim Awwal
57d5ba07c0 Remove commented out block and pull some stuff into a function to load the first page of results for a thread query. 2012-09-21 04:33:16 -07:00
Ibrahim Awwal
939b927fbd Merge branch 'master' into feature/ibrahim/followed-threads
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
2012-09-20 23:55:13 -07:00
Arjun Singh
6132b9b207 Alter some css; don't send the user if there is no user when retrieivng a thread 2012-09-20 02:11:27 -07:00
Ibrahim Awwal
e809fb3b64 Use loadMorePages to load All as well. 2012-09-19 07:02:24 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
Ibrahim Awwal
74ba9319e3 Fix clicking on commentables in the dropdown. 2012-09-18 16:30:37 -07:00
Ibrahim Awwal
0966e8bdef Keep thread sorting order stable when sorting by comments or votes by using
created_at time as a tiebreaker. This is a stopgap though; the service should handle
this. But it looks silly with things shuffling around right now.
2012-09-18 15:06:05 -07:00
Ibrahim Awwal
53a1611eee Change following=>followed. 2012-09-18 14:50:14 -07:00
Ibrahim Awwal
ef8ca23dee Fix pagination and sorting for followed threads. Also fixed sorting so that it always retrieves a new set of threads from the server for the initial set. 2012-09-18 04:35:32 -07:00
Ibrahim Awwal
a444166d98 Add a followed threads entry to the topic dropdown in the discussion sidebar.
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
2012-09-18 04:09:38 -07:00
Ibrahim Awwal
7fb757c86c Rename Tooltips => TooltipManager. 2012-09-17 23:03:36 -07:00
Ibrahim Awwal
aa301a805e Converted tooltips to coffee too, and removed both converted files from the included js header. 2012-09-17 19:19:09 -07:00
Ibrahim Awwal
daa38af58c Convert DiscussionFilter to coffeescript. 2012-09-17 18:55:52 -07:00
Ibrahim Awwal
bb6f4cdb2e Move dropdown filter into a more clearly named file, discussion-filter.js, and move the
event bindings into the proper views.
2012-09-17 18:08:44 -07:00