Jay Zoldak
c3eba0d2da
Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS.
2013-01-29 16:22:37 -05:00
Don Mitchell
574d6e8e28
Simple zIndex rather than fancy stack works best.
2013-01-29 15:00:49 -05:00
Don Mitchell
63d269acf1
draggable is not the collapsed item :-( but ui.helper seems to be.
2013-01-29 14:31:14 -05:00
Don Mitchell
87d8598abe
subsection drag
2013-01-29 13:43:58 -05:00
Don Mitchell
5fcb6bfcd4
Remove debug code
2013-01-29 13:16:21 -05:00
Don Mitchell
ba95cf2385
Auto expand on hover of drag&drop unit
2013-01-29 13:10:23 -05:00
Brian Talbot
8a6dc040a9
studio - styled first children in an overview's subsection list for drag and drop work
2013-01-25 15:26:25 -05:00
Don Mitchell
0009430b59
min height on droppable areas and add padding to top/bottom on hover.
2013-01-25 14:30:51 -05: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
Don Mitchell
3e048d7072
Removed old function
2013-01-23 14:15:09 -05:00
Don Mitchell
2db0401273
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
...
Conflicts:
cms/envs/common.py
2013-01-23 14:13:17 -05:00
Don Mitchell
4d0d46462c
Fixed the y axis drop problem by requiring it to be within the x bounds.
2013-01-23 12:12:40 -05:00
Don Mitchell
ad5f00f270
Drag and drop for sections, subsections, and units works with following
...
caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.
2013-01-23 11:16:04 -05:00
Brian Talbot
5e7726079e
studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon
2013-01-22 23:32:51 -05:00
Don Mitchell
2ae92cbd88
Added RequireJS to fix expectation that it's included.
...
Unit drag and drop works correctly now.
2013-01-22 17:25:28 -05:00
Brian Talbot
023dadd074
studio - resolved base variable missing issue on lms side
2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478
studio html editor - matched up styles for <pre> elements
2013-01-22 16:16:30 -05:00
cahrens
731fb209de
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
...
Conflicts:
cms/static/css/tiny-mce.css
2013-01-22 16:15:27 -05:00
Brian Talbot
b381881a02
studio html editor - adding in font references to tinyMCE css
2013-01-22 16:05:06 -05:00
Brian Talbot
aec7692d27
studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)
2013-01-22 15:51:12 -05:00
Brian Talbot
e3a2749ff8
studio html editor - added in styles for TinyMCE table elements
2013-01-22 15:20:25 -05:00
Don Mitchell
1b64faf610
Caching to change branches for other work
2013-01-22 11:42:23 -05:00
Don Mitchell
48fa4b4a5e
Cache in order to try updated sortable lib
2013-01-22 11:39:23 -05:00
Brian Talbot
72fc192f6e
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
2013-01-18 10:24:29 -05:00
Brian Talbot
d2f79f10f0
studio - synced LMS common content styles with HTML component display/edit rendering styles
2013-01-18 09:59:08 -05:00
Brian Talbot
70457176f1
studio - stubbed in basic LMS styling to HTML displaygst
2013-01-17 21:28:14 -05:00
Brian Talbot
5b82a68c18
studio - removing extra line/whitespace in sass
2013-01-17 17:06:07 -05:00
Brian Talbot
66a3e9621b
studio - removed editor type icon and text for all components except for problems
2013-01-17 17:04:28 -05:00
cahrens
77865f7ab2
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-17 14:22:18 -05:00
cahrens
d4f79c0498
Fix bug related to img link for non-img files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
2013-01-16 13:51:17 -05:00
cahrens
29f49895d3
Pretty much works.
2013-01-14 15:41:12 -05:00
Brian Talbot
11656feba3
one last style tweak to problem header styling
2013-01-13 13:10:29 -05:00
Brian Talbot
2429192765
resolved problem headers/general H1 elements floating by default in component views
2013-01-13 13:07:11 -05:00
Brian Talbot
1cf5e10a34
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
2013-01-13 12:47:30 -05:00
Brian Talbot
04e9447367
added in icons for header and explanation markdown elements
2013-01-13 12:15:29 -05:00
Don Mitchell
06aa4a553e
Correct file name case (which I thought mac os would catch :-(
2013-01-11 16:53:23 -05:00
Don Mitchell
c05d887904
Handle metadata from save being empty
2013-01-11 10:39:57 -05:00
Don Mitchell
d53ca05d6c
Placeholder images for cheat sheet
2013-01-11 09:37:08 -05:00
Christina Roberts
a7887721af
Merge pull request #1255 from MITx/bug/btalbot/unit-editing
...
Moving Static Component View Under Modal While Editing
2013-01-10 10:35:31 -08:00
Brian Talbot
4128f37a1f
studio - moving a component's static view visually below modal while editing
2013-01-10 13:18:26 -05:00
Christina Roberts
b3af587ba0
Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling
...
Course Overview Section Collapse/Expand Toggling
2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb
Bug fix for modal cover not going way when click outside of edit ( #106 ).
2013-01-10 11:07:11 -05:00
chrisndodge
ee9b9d0422
Merge pull request #1249 from MITx/feature/cas/speed-editor
...
Feature/cas/speed editor
2013-01-09 17:52:46 -08:00
Don Mitchell
96a7db62cd
Fixed time picker race condition for grace period. Still quirky in that
...
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
2013-01-09 17:55:02 -05:00
Brian Talbot
7921b32b63
studio - set viewport to scroll to bottom of component type list in component editor
2013-01-09 15:04:20 -05:00
Brian Talbot
19fa439326
studio - firming up section-wide collapsing/expanding functionality
2013-01-09 12:31:32 -05:00
cahrens
64387a4f0c
Tom cruft to be deleted, problem editor CSS moved to correct location.
2013-01-09 11:06:18 -05:00
cahrens
5daa6e7b73
Tom cruft to be deleted.
2013-01-09 10:49:59 -05:00
Brian Talbot
2a1e102fca
studio - resolving merge conflict with cms/templates/unit.html
2013-01-09 08:56:58 -05:00
Brian Talbot
f60a9d8d35
studio - problem speed editor: tweaking presentation of problem sub menu further
2013-01-09 08:54:40 -05:00
