Commit Graph

2914 Commits

Author SHA1 Message Date
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Tom Giannattasio
b41ab37c4e fixed padding on a few buttons 2012-11-30 07:51:14 -05:00
Tom Giannattasio
fbbf9e9c0f key bindings and speed reworkings for the my courses and courseware pages 2012-11-29 16:21:51 -05:00
Don Mitchell
7ed0002bd2 Details now has validation except for youtube ids which cause
crossdomain policy violations when i try to validate.
2012-11-29 16:18:36 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Brian Talbot
a2f00c383f gradable sections - adding in assets and markup - wip 2012-11-28 16:12:34 -05:00
Tom Giannattasio
6cfabb76c1 finished styling for static tabs; required some rework of global styles 2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced most of the styling and function changes made 2012-11-28 15:10:46 -05:00
Don Mitchell
a68dee9743 Got rid of datepair as it was generating a jquery bug but also not
doing what we wanted.
2012-11-27 16:38:21 -05:00
Don Mitchell
5331ae055f Got time change hooked up but gained a spurious call to change on date
change.
2012-11-27 15:15:28 -05:00
Don Mitchell
5e2dba6bad Minor cache to pull talbott's changes 2012-11-27 13:22:44 -05:00
Don Mitchell
8a27e1776b Merge branch 'feature/btalbot/cms-settings' of
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
2012-11-27 12:12:43 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
Brian Talbot
c3e11b4217 settings - added in additional time fields for course dates 2012-11-27 09:50:25 -05:00
Tom Giannattasio
bb2e78ce30 reworked slider logic 2012-11-26 15:54:46 -05:00
Brian Talbot
be848023a2 settings - added in example of anon discussions disabled state 2012-11-26 14:21:01 -05:00
Brian Talbot
4027576e15 settings - resolved date and time picker UI bugs 2012-11-26 14:01:11 -05:00
Brian Talbot
4097bc1022 settings - revised grading slider UI cosmetics 2012-11-26 13:33:57 -05:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Tom Giannattasio
a98cead8ee added basic lms styles 2012-11-20 13:02:08 -05:00
Don Mitchell
f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html
2012-11-20 11:55:19 -05:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00
Brian Talbot
6c3c377619 settings - general class/ID naming convention cleaning 2012-11-20 11:34:16 -05:00
Brian Talbot
a69d3cb064 settings - discussion UI revision 2012-11-20 09:32:13 -05:00
Brian Talbot
278c731aef settings - made assignment types user-determined fields vs. pre-set types in UI 2012-11-20 09:26:40 -05:00
Brian Talbot
f29f605f62 settings - refactored radio/checkbox input formatting 2012-11-20 08:40:45 -05:00
Tom Giannattasio
af908104df fixed html tab; started adding upload within widget 2012-11-20 07:19:35 -05:00
Tom Giannattasio
c233740057 cleaning up of asset widget; html tab is broken 2012-11-20 07:19:35 -05:00
Tom Giannattasio
8abf93cc36 search and upload button added to widget 2012-11-20 07:19:35 -05:00
Tom Giannattasio
9613f92fad asset widget inserts into tiny 2012-11-20 07:19:35 -05:00
Tom Giannattasio
f16e7b2ede added asset library widget template 2012-11-20 07:19:35 -05:00
Tom Giannattasio
d521c850de started adding asset widget 2012-11-20 07:19:35 -05:00
Tom Giannattasio
ac20da3f30 removed plugins, adjusted visualEditor reference 2012-11-20 07:19:35 -05:00
Tom Giannattasio
c7dbdc1242 added asset button to visual editor 2012-11-20 07:19:35 -05:00
Tom Giannattasio
10a4d4ec25 tiny mce styling 2012-11-20 07:19:34 -05:00
Tom Giannattasio
b38072207e primary tiny mce integration 2012-11-20 07:19:34 -05:00
Tom Giannattasio
9c3c72ad3c discussion editor and preview added; string response glitch fixed 2012-11-20 07:19:34 -05:00
Tom Giannattasio
daea87ebb9 simple html editor added 2012-11-20 07:19:34 -05:00
Tom Giannattasio
e446ed8118 removed stupid console log 2012-11-20 07:19:34 -05:00
Tom Giannattasio
f8ee3efc7a simplified syntax to match arjun's for string and numerical response 2012-11-20 07:19:34 -05:00
Tom Giannattasio
f2eb665626 cheatsheet and advanced settings added 2012-11-20 07:19:34 -05:00
Tom Giannattasio
44fb9561e8 added a ton of speed editor goodness 2012-11-20 07:19:33 -05:00
Don Mitchell
7fecf1f212 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_settings.scss
	cms/templates/settings.html
2012-11-19 16:20:12 -05:00
Don Mitchell
241c9bb1ac Checkpoint to rebase 2012-11-19 16:02:30 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
Brian Talbot
d370307917 settings - simplified course details fields per Mark's feedback and radio/checkbox UI 2012-11-19 15:48:57 -05:00
Brian Talbot
c7784e30fd settings - radio/checkbox UI - wip 2012-11-19 14:59:25 -05:00
Brian Talbot
ab87ff6b20 settings - field alignment, radio/checkbox formatting 2012-11-19 14:55:32 -05:00
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00
Don Mitchell
91a91f4ddb Hopefully the course-info changes I had made w/o link destruction 2012-11-19 10:38:58 -05:00