Don Mitchell
0b762fa35f
Remove ability to set gradability at the section level (commented out
...
until we decide the inheritance)
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings
Fix menu dismissa
Fix ambiguous selection
2012-12-14 15:19:14 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
Brian Talbot
4e152952af
cms settings - revised course overview textarea to display as codemirror field on page load
2012-12-14 11:57:46 -05:00
Brian Talbot
91713cbe18
editing UI - added in preventDefault() to all editing actions on course info
2012-12-14 11:14:09 -05:00
Brian Talbot
c7feaa1373
editing - revised unit editor styling
2012-12-14 10:54:44 -05:00
Christina Roberts
fef3fd871e
Merge pull request #1154 from MITx/feature/dhm/cms-settings
...
Fixed 2nd fn which had regex infinite loop
2012-12-14 06:58:43 -08:00
Don Mitchell
b9d9c7b8c0
Fixed infinite loop in the 2nd video string parser which I'd fixed in
...
the first yesterday. Fixed formatting of compounded video string errors.
2012-12-14 09:48:04 -05:00
Don Mitchell
1eacd5e346
Fix infinite loop in videosourceSample. Had fixed same one in
...
parse_videosource but neglected to fix this one.
2012-12-14 09:45:25 -05:00
Don Mitchell
6c64032fcf
Overview should be ready to test.
2012-12-14 09:22:54 -05:00
Don Mitchell
e0849e8b5a
Cache to debug other branch
2012-12-13 16:34:58 -05:00
chrisndodge
094856e229
Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups
...
Various Style/UI Tweaks
2012-12-13 12:41:10 -08:00
Brian Talbot
59f1b1d1f5
styling - re-aligned unit controls for unit editing and styled standard delete button
2012-12-13 15:15:30 -05:00
Brian Talbot
15942aae05
styling - re-aligned unit edit controls and added visual divider
2012-12-13 15:02:38 -05:00
Brian Talbot
2524992965
styling - settings UI tweaks
2012-12-13 14:24:09 -05:00
Brian Talbot
090e83b709
styling - resolved FF top whitespace bug
2012-12-13 14:16:51 -05:00
Christina Roberts
c182b8ef08
Merge pull request #1145 from MITx/feature/dhm/cms-settings
...
Feature/dhm/cms settings
2012-12-13 11:12:04 -08:00
Brian Talbot
f33efe3dde
settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer
2012-12-13 13:45:57 -05:00
Brian Talbot
34441759dd
settings - added in preventDefault() for all grading controls that needed it
2012-12-13 13:44:03 -05:00
Brian Talbot
6b17659195
styling - settings layout and delete buttons
2012-12-13 13:35:58 -05:00
Brian Talbot
3b784f2145
styling - setting form field layout
2012-12-13 13:21:43 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Don Mitchell
9cc1b348fa
Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings
2012-12-13 13:02:03 -05:00
Don Mitchell
9b9bdb44a3
Fix video string parse for empty and completely malformed strings
2012-12-13 12:58:59 -05:00
Don Mitchell
a39d609eea
more
2012-12-13 12:35:17 -05:00
Don Mitchell
595edac4c2
Caching changes to fix critical bug on other branch
2012-12-13 12:33:22 -05:00
Brian Talbot
7d823d9ed9
resolving styling merge conflicts
2012-12-13 11:43:48 -05:00
Brian Talbot
9f863fd96e
styling - adjusting collapse button CSS lost in cms-master rebase
2012-12-13 11:37:51 -05:00
Tom Giannattasio
2be1f852e7
clean up of users page
2012-12-13 11:28:59 -05:00
Tom Giannattasio
75c4909785
added modal cover for editors
2012-12-13 11:28:59 -05:00
Tom Giannattasio
d7b3f28d17
reworked add component steps
2012-12-13 11:28:59 -05:00
Tom Giannattasio
66004aeb2d
pulled out component types from behind add component button
2012-12-13 11:28:59 -05:00
Tom Giannattasio
5b81d6b8cc
cleaned up subsection and unit page
2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a
cleaned up editor styles; cleaned up static tabs page
2012-12-13 11:26:10 -05:00
Tom Giannattasio
39a882e278
more defined header, new icons, cleaner static tabs page
2012-12-13 11:25:15 -05:00
Tom Giannattasio
95dfc730dc
new header styles; collapse all button added to courseware
2012-12-13 11:20:30 -05:00
Tom Giannattasio
8294b05802
style tweaks to tabs and static pages; key bindings for new user form
2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235
tweaked body color and window styles; adjusting new buttons
2012-12-13 11:20:30 -05:00
Tom Giannattasio
74ce3d225f
removed new course button on click to prevent multiple instantiations
2012-12-13 11:19:22 -05:00
Tom Giannattasio
131f475156
headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style
2012-12-13 11:19:22 -05:00
Tom Giannattasio
128a402b7f
fixed long header bug
2012-12-13 11:19:22 -05:00
Don Mitchell
909fd93c80
Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable
...
Conflicts:
cms/static/sass/_variables.scss
2012-12-13 10:40:49 -05:00
chrisndodge
6ab97b6fd9
Merge pull request #1125 from MITx/feature/dhm/cms-settings
...
Feature/dhm/cms settings
2012-12-13 06:52:49 -08:00
Don Mitchell
41ca47edfc
Add flag to turn template caching on/off (default to off)
2012-12-13 09:47:51 -05:00
Brian Talbot
57385b8d3f
grading - resolved rebase/merge conflicts
2012-12-13 09:45:11 -05:00
Chris Dodge
3421331f17
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
2012-12-13 09:25:13 -05:00
Chris Dodge
fc8281d517
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
2012-12-13 09:22:01 -05:00
Chris Dodge
35317b0679
more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics.
2012-12-12 20:47:37 -05:00
Don Mitchell
e75f63e957
More merge repairs. Hopefully done.
2012-12-12 17:13:55 -05:00
Don Mitchell
ea6532efd7
Fix screwed up merge
2012-12-12 16:51:05 -05:00
Chris Dodge
84b08b5ef5
call remove() on CodeMirror
2012-12-12 15:03:49 -05:00
