Commit Graph

44 Commits

Author SHA1 Message Date
Felix Sun
4220252055 Fixed terribly annoying issues with back button. Back button is now on
the bottom of the hint div, no matter what.
2013-08-26 09:40:05 -04:00
Felix Sun
2d1c9158d8 Added fancy sliding transitions into hint collection page. 2013-08-26 09:40:05 -04:00
Felix Sun
35a8e9be32 Some fixes on hint ui. 2013-08-26 09:40:05 -04:00
Felix Sun
7c93b45d0c Added wizard / slideshow style hint collection script.
Still requires a little polishing, I think.
2013-08-26 09:40:05 -04:00
Felix Sun
64c91cf239 UX improvements to hinting. Interface is now less cluttered.
Hint submission is hidden behind a link, if there are hints to vote on.
2013-08-26 09:40:05 -04:00
Felix Sun
d6715749dc Addressed pull request comments.
Fixed broken tests.
2013-08-26 09:40:04 -04:00
Felix Sun
e2aea75f16 Fixed a bug in recording hints shown.
Removed the answer display next to voting.  (This was deemed distracting.)
2013-08-26 09:40:04 -04:00
Felix Sun
8ce53ed8eb Got rid of answer signatures - these don't work with approximate answers at all. Instead, implemented comparison-based hint matching.
Tests are broken, hint manager is probably broken.
2013-08-26 09:40:03 -04:00
Felix Sun
6b40c5cf13 Changed hint voting ui to show all hints on one page.
Fixed broken tests for hint manager.
2013-08-26 09:40:03 -04:00
Felix Sun
a730f9189b Fixed numerous 500 errors that result from mal-formatted post requests.
Fixed tests to work with symbolic answer changes.
2013-08-26 09:40:03 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
Felix Sun
fc8acb61a3 Changed voting dialog to only display one tab per answer.
No tests for this, yet.

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/templates/hinter_display.html
2013-08-26 09:40:02 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
David Ormsbee
35f66f8469 Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194 2013-07-16 09:20:35 -04:00
Felix Sun
09d3ca0ab6 Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing.
Fixed bug when hinter module displays a hint, then is asked to display nothing.  (Used to not update in this case.)
2013-07-02 09:40:47 -04:00
Felix Sun
0c4d6ba6d9 Made explanation for hints field in crowdsource_hinter.py more clear.
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
2013-07-01 11:52:52 -04:00
Carlos Andrés Rocha
0b25e76194 Improve styling of the crowdsource hinter 2013-07-01 10:34:20 -04:00
Felix Sun
aae5758a99 Edited text of crowdsourced hinter template to Piotr's suggestions. Added some HTML formatting to same. 2013-07-01 10:25:05 -04:00
Felix Sun
ab303e7567 Fixed numerous code-formatting issues and pep8 violations.
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
2013-07-01 10:25:04 -04:00
Felix Sun
242d0c28ae Properly fomatted the tab-based UX for hint-voting.
Chiseled a little at writing template tests.
2013-07-01 10:25:04 -04:00
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template.
Hinter now displays vote count after voting.

Began testing templates.
2013-07-01 10:25:04 -04:00
Renzo Lucioni
841ff4765f Abridge tests in light of learning how Segment.io works 2013-06-18 17:58:10 -04:00
Renzo Lucioni
305e9315ef Write Jasmine tests to prove Segment.io works in Logger 2013-06-18 14:27:43 -04:00
Calen Pennington
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -04:00
Jay Zoldak
cc2cc469fe more work on jasmine tests for forums 2013-05-16 10:56:57 -04:00
Jay Zoldak
cbdf93473b start to get the jasmine tests working for comment service 2013-05-16 10:56:57 -04:00
Jay Zoldak
ed3df10638 Set up rake task for jasmine tests for discussion forums code. 2013-05-16 10:56:57 -04:00
Will Daly
6b94090e67 Fixed jasmine test issue with cms caused by previous change
to order of file import.  Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Will Daly
618de5df25 Fixed import error for histogram.coffee 2013-03-11 11:27:49 -04:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll
racing condition.
2013-01-25 12:44:58 -05:00
cahrens
a1eeb56839 Import requireJS. 2013-01-23 12:30:06 -05:00
cahrens
db9875758f Saving work. 2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a Work in progress, related to rich HTML editor. 2013-01-14 15:41:12 -05: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
David Ormsbee
c2c016c58b Fix MathJax S3 URL to use the standard HTTPS location 2012-11-30 18:00:45 -05:00
David Ormsbee
0b3d739646 Switch to S3 hosted mathjax (I thought we did this ages ago). 2012-11-30 17:01:30 -05:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04: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
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Bridger Maxwell
1e08164db5 Added MathJax to wiki pages. 2012-08-18 13:12:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00