cahrens
6981ba4e3f
Get Save and Cancel working.
2013-02-19 17:08:10 -05:00
cahrens
d5903c0e60
Make HTML better formatted.
2013-02-19 15:14:05 -05:00
cahrens
167d07037d
Merged, delete Ace.
2013-02-19 14:56:37 -05:00
Brian Talbot
585dff521a
Merge branch 'master' into feature/btalbot/studio-pagechrome
2013-02-19 12:27:49 -05:00
Brian Talbot
fca98c19a5
studio - adding in info icon to page intro help and making icon classes consistent in all new references
2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c
Hook up "View Live" buttons and get "New Static Tab" working again.
2013-02-19 11:34:41 -05:00
Don Mitchell
cfa13922f5
Change url for login from login to signin.
2013-02-15 17:30:24 -05:00
Brian Talbot
3c6caa611c
resolving local merge
2013-02-15 14:24:42 -05:00
Brian Talbot
a5e2b5c53a
resolving merge conflict and missing Sass mixin
2013-02-15 14:10:52 -05:00
cahrens
b49325009a
Merge branch 'master' into feature/btalbot/studio-softlanding
2013-02-15 13:14:46 -05:00
Brian Talbot
9feb810006
studio - final prep of introduction areas (with fix for current page content margins)
2013-02-14 13:16:10 -05:00
Brian Talbot
bd98b2726a
resolving local merge conflict
2013-02-14 13:00:51 -05:00
Brian Talbot
c81f958788
studio - final prep of introduction areas (with fix for current page content margins)
2013-02-14 13:00:14 -05:00
Brian Talbot
9b09d043bd
studio - adding introduction areas to all templates and infrastructure for its contnet
2013-02-14 12:49:58 -05:00
Mark L. Chang
859cfff870
updated modal copy and alt text
2013-02-14 12:42:17 -05:00
Brian Talbot
47c117bf03
studio - page headers: resolved new course update creation JS issue caused by new markup
2013-02-14 10:52:25 -05:00
Brian Talbot
1a1be106ae
studio - page headers: added in view live links to course dashboard
2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca
studio - page headers: added view course button to course outline
2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae
studio - page headers: added in logic to style page actions' height based on title having a subtitle or not
2013-02-14 09:38:32 -05:00
Brian Talbot
41dc655cce
resolving local merge conflict
2013-02-14 09:03:46 -05:00
Brian Talbot
557beea31f
studio - hiding mast area for subsections
2013-02-14 09:00:57 -05:00
Mark L. Chang
b7e8335a19
switched taxonomy back to section/subsection/unit
2013-02-13 22:53:46 -05:00
Brian Talbot
d571c7791a
studio - resetting Unit UI HTML back to prev version for now
2013-02-13 17:01:45 -05:00
Don Mitchell
9d2b92c362
Don't show 'empty' metadata field
...
Change logic for when to show simple v advanced editor to use an
explicit flag.
2013-02-13 16:34:11 -05:00
Don Mitchell
18ecd11583
Only tabify the problems submenu.
2013-02-13 16:33:19 -05:00
Don Mitchell
62d389c853
Added empty metadata attribute instead of using name to determine which
...
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
marco
c238fc3d74
cleaned up css and advanced tab shows proper component list, also using jquery.ui.js
2013-02-13 16:33:19 -05:00
marco
9eb87e1eac
final css tweaks prior to jquery bug resolution
2013-02-13 16:33:19 -05:00
marco
fc0a26ae74
styled header of problem component adding menu and made it only visible when you are in the problem menu
2013-02-13 16:33:19 -05:00
marco
a57e91ef47
revision of visual styling per product team feedback round
2013-02-13 16:33:18 -05:00
marco
3a3e0f6322
removed green entirely, increases size of fonts and buttons for adding of new components
2013-02-13 16:33:18 -05:00
marco
c09a50f54d
draft styles for problem type header closer, need design consistency/standards review to proceed
2013-02-13 16:33:18 -05:00
marco
a147c66257
partial styles for problem type header, still work remains.
2013-02-13 16:33:18 -05:00
marco
60032047d7
added jquery tabs for problem editor, but a bug in rendering is stumping me, will fix tomorrow.
2013-02-13 16:33:17 -05:00
marco
18f2f97eb1
edited problem editor tooltips to have new names and also changed sample problem text to use new names
2013-02-13 16:33:17 -05:00
Brian Talbot
e23c99961d
studio - page headers: completed basic styling and simple page set-ups
2013-02-13 15:03:26 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Brian Talbot
e13db29efc
resolving merge from feature/btalbot/studio-softlanding
2013-02-13 12:42:15 -05:00
Brian Talbot
03e7d2e77b
studio - soft landing: changing 'sign into' to 'sign in to' copy
2013-02-13 12:18:27 -05:00
Don Mitchell
f7e635a7cd
fix npe w/ prev commit
2013-02-13 11:22:35 -05:00
Don Mitchell
4e3e2ec707
If user was trying to get to a specific page but had to log in, let them
...
get to that page once they've logged in.
2013-02-13 11:20:08 -05:00
Don Mitchell
3450c72833
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
2013-02-13 09:31:09 -05:00
Don Mitchell
6f3a954d7b
howitworks is default home page if not logged in. Otherwise course
...
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
2013-02-13 09:30:54 -05:00
Brian Talbot
714f69a57e
studio - resolving merge conflicts in settings from a recent rebase
2013-02-13 09:07:53 -05:00
Brian Talbot
fccb3d7a73
studio - nav and soft landing various QA fixes
2013-02-12 17:36:36 -05:00
Brian Talbot
0a2b74110e
studio - nav and soft landing various QA fixes
2013-02-12 17:03:48 -05:00
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
Brian Talbot
70e11e823c
studio - made all page heading chrome have consistent markup
2013-02-12 15:07:32 -05:00
Brian Talbot
540710f553
studio - nav revamp: added in dynamic course org and number to header
2013-02-12 14:22:42 -05:00
Brian Talbot
22b959d657
studio - link wiring and spot styling changes for new nav/soft landing/settings work
2013-02-12 11:16:37 -05:00
