Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

230 Commits

Author SHA1 Message Date
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
Don Mitchell
40668133f7 Fix bug which I know I fixed before (perhaps on another branch?) to 
ensure old time had a value before comparing it to new time.
 2013-02-12 15:11:35 -05:00
Don Mitchell
c9c026be62 Fixed urls 2013-02-12 12:15:07 -05:00
Brian Talbot
7ca267fd78 studio - debugging grading settings JS errors WIP 2013-02-12 11:56:54 -05:00
Don Mitchell
8bc9564d92 clean up note to self 2013-02-11 16:45:36 -05:00
Don Mitchell
777e0ef9c5 The other one was too inclusive 2013-02-11 16:36:34 -05:00
Don Mitchell
565f5f0adc Stop simple clicks from paging to top w/o disrupting dnd 2013-02-11 16:28:22 -05:00
Brian Talbot
715cea51a4 studio - resolved scss that relied on old body classes 2013-02-11 16:09:33 -05:00
Don Mitchell
ae4a854e18 Bug 180 2013-02-11 15:46:58 -05:00
Don Mitchell
773dfce68d Try to make server and validation errors work together. Getting double 
errors when there are parent and child views both defining on error
handlers still.
 2013-02-11 12:04:45 -05:00
Don Mitchell
9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html
 2013-02-07 14:56:48 -05:00
Don Mitchell
31393043d0 More for that commit 2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single 
file not used.
 2013-02-07 14:45:24 -05:00
Brian Talbot
5b9609abf6 studio - soft landing: various fixes/tweaks 2013-02-07 14:09:47 -05:00
Brian Talbot
5674dd19c4 studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS 2013-02-07 09:58:52 -05:00
Brian Talbot
cb9d960a28 studio - soft landing: style dropdown arrows 2013-02-06 15:46:10 -05:00
Brian Talbot
d11f10cc66 studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately 2013-02-06 14:37:09 -05:00
Brian Talbot
1dae21e969 studio - course nav: styled dropdown navigation 2013-02-06 14:16:49 -05:00
Don Mitchell
0f5571f499 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-06 09:48:09 -05:00
Don Mitchell
902cdefefa Added comments for unused 2nd arg on generateCheckHoverState 2013-02-04 12:05:49 -05:00
Don Mitchell
50eced5b32 Attempt to patch the dnd hesitation fixes onto master 2013-02-04 11:34:59 -05:00
Brian Talbot
83ad950887 studio - revised course nav: plumbed in current html and scss progress into header 2013-02-01 20:48:59 -05:00
Don Mitchell
1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html 2013-02-01 17:20:58 -05:00
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00
Don Mitchell
19927a83a5 Ensure settings and course info CRUD operations tell the user if there's 
a server error and pull the server error handler into a common function.
 2013-01-30 11:24:55 -05:00
Don Mitchell
ab4fd03dd8 Catch any and all save errors 2013-01-30 09:43:27 -05:00
Don Mitchell
b8c1dba1cb Catch save error and throw it in the user's face (bug 147). May need to 
add catches in more places or put in $.ajaxSetup?
 2013-01-29 17:31:12 -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
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
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
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
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
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
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
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
19fa439326 studio - firming up section-wide collapsing/expanding functionality 2013-01-09 12:31:32 -05:00
Brian Talbot
6b8944ad6b studio - section expanding/collapsing UI - wip 2013-01-07 09:07:40 -05:00
Brian Talbot
ce4994dd94 studio - revised course overview section collapse button to toggle collapsing/expanding 2013-01-04 13:27:59 -05:00
Don Mitchell
d66f33956e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-19 17:31:30 -05:00
Don Mitchell
e37180e074 Generalized the grader drop down and applied to edit_subsection 2012-12-19 17:31:06 -05:00
cahrens
61c19dbc70 Fix for Studio #87, plus some cleanup. 2012-12-19 16:55:39 -05:00