Commit Graph

1247 Commits

Author SHA1 Message Date
Brian Talbot
d00a1f35c7 studio - soft landing: resolved not signed in header nav length issue 2013-02-06 15:00:40 -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
946d1617e7 studio - resolving merge conflict in header widget 2013-02-06 14:18:55 -05:00
Brian Talbot
1dae21e969 studio - course nav: styled dropdown navigation 2013-02-06 14:16:49 -05:00
Don Mitchell
31d541e5ad Wire up settings to menu (3 different ways just b/c it's possible) 2013-02-06 13:42:51 -05:00
Brian Talbot
b0be1cd3dc studio - soft landing: revised app nav flexible grid 2013-02-06 11:36:08 -05:00
Brian Talbot
b98c643aaf studio - merging soft landing local work with rebased branch 2013-02-06 10:59:59 -05:00
Brian Talbot
bb789e758b studio - course nav: general flex-grid layout - WIP 2013-02-06 09:57:03 -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
Brian Talbot
280de111e1 studio - soft landing: fixed flexible grid proportions on sign up/in UI 2013-02-06 09:18:34 -05:00
Brian Talbot
8c86eb2522 studio - soft landing: revised copy 2013-02-06 09:03:07 -05:00
Brian Talbot
1687a99c5c studio - soft landing: added in modal copy and resolved image dimensions issue 2013-02-06 08:53:23 -05:00
Brian Talbot
56b8353dfd studio - soft landing: refined sign in/up error states visually 2013-02-05 16:41:24 -05:00
Christina Roberts
3222e083eb Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
Fix bug where we imported two functions w/ the same name
2013-02-05 13:36:56 -08:00
Christina Roberts
0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
change from throwing a Http404 exception, which I believe will try to re...
2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
Calen Pennington
8360a7a7f5 Fix bug where we imported two functions w/ the same name 2013-02-05 16:23:10 -05:00
Brian Talbot
b0d843e38d studio - soft landing: removed forgot password link from tab order of sign in form 2013-02-05 14:55:58 -05:00
Brian Talbot
cdf28f6183 studio - soft landing: added in edX Studio logo 2013-02-05 14:14:14 -05:00
David Ormsbee
e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic
Free courses from the confines of collectstatic
2013-02-05 10:32:54 -08:00
Brian Talbot
8bb5cc1c23 studio - course nav: added in root link to main nav 2013-02-05 11:50:58 -05:00
Brian Talbot
afa5b75de2 studio - soft landing: optimizing/compressing new images 2013-02-05 11:48:30 -05:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
Brian Talbot
b456281a8f studio - soft landing/nav: added in functionality/content to soft landing view and started punch list 2013-02-05 11:34:28 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
This reverts commit c4f56620df.
2013-02-05 11:06:45 -05:00
Brian Talbot
b654ee4006 studio - soft landing: further styling and modal set-up - WIP 2013-02-04 20:25:58 -05:00
Brian Talbot
db21156d40 studio - soft landing: added in hover/active states for elements 2013-02-04 17:18:12 -05:00
Brian Talbot
ffd585ae56 studio - resolved safari/webkit display issue with unit editing window's wrapper background color 2013-02-04 14:44:17 -05:00
Brian Talbot
6ca55b8458 studio - overview drag and drop: removed unused scss and hid new unit button while dragging 2013-02-04 14:35:04 -05:00
Brian Talbot
71ae45fd0e studio - soft landing UI: how it works styling - wip 2013-02-04 14:23:44 -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
c9dc762a2b studio - soft landing UI: how it works basic layout styling 2013-02-04 09:54:14 -05:00
Brian Talbot
ecbe297936 studio - soft landing UI: how it works pathing, html and basic layout styling 2013-02-04 09:39:36 -05:00
Brian Talbot
79e3482265 studio - soft landing UI: initial how it works plumbing 2013-02-04 08:25:58 -05:00
Brian Talbot
e207881b50 studio - soft landing UI: button tweaks 2013-02-04 08:21:32 -05:00
Brian Talbot
4946eace2a studio - soft landing UI: sign in and basic styling/layout tweaks 2013-02-04 00:43:24 -05:00
Brian Talbot
5a1795db85 studio - soft landing UI: basic signin/sign up styling and sign up markup/templating 2013-02-04 00:19:26 -05:00
Brian Talbot
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Brian Talbot
604bfcc04a studio - course nav - fixing width of course name for now 2013-02-03 20:20:35 -05:00
Brian Talbot
22444f6dfe studio - revised course nav: fixed placeholder login link text 2013-02-01 20:50:29 -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
Brian Talbot
d0d0296310 studio - revising course-based navigation - initial scss setup 2013-02-01 19:57:17 -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
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
Christina Roberts
14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists
temporary style sync up for course info lists
2013-02-01 06:51:35 -08:00