2460 Commits

Author	SHA1	Message	Date
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
Brian Talbot	8976818c78	studio - header UI: in progress markup changes WIP	2013-02-12 09:16:24 -05:00
Brian Talbot	8f5d8a98c7	studio - resolved sidebar content organization and styling	2013-02-11 16:20:25 -05:00
Brian Talbot	3eead4701b	studio - settings: hiding link to advanced settings for now	2013-02-11 15:59:10 -05:00
Don Mitchell	de0fd2ef0c	Cross reference the settings pages	2013-02-11 15:02:02 -05:00
Brian Talbot	04e3d68bd5	studio - settings: added back in broken links for Don to check out	2013-02-11 13:47:03 -05:00
Brian Talbot	8367f565dc	studio - settings: revised URLs for temporary consistency and added in help/explanation text 1st draft	2013-02-11 13:21:35 -05:00
Brian Talbot	ea709684d0	studio - settings: synched up styling/controls for existing video with other existing fields	2013-02-11 12:13:25 -05:00
Brian Talbot	77343519c6	studio - settings: revising enumerated item lists	2013-02-11 12:08:31 -05:00
Brian Talbot	274d1752e0	studio - general UI cleanup in prep for this branch's end/release vs. future work	2013-02-11 11:49:03 -05:00
Brian Talbot	a3a0e8b5e5	studio - view header UI: unit page revamp WIP	2013-02-11 09:57:16 -05:00
Brian Talbot	0983df9463	studio - view header UI: added in initial markup for several pages WIP	2013-02-11 09:35:31 -05:00
Brian Talbot	1936b47ba5	studio - small display tweaks to setting form new/remove actions	2013-02-11 09:01:52 -05:00
Brian Talbot	a5ccfc61cd	studio - hiding footer links until we have copy/pages	2013-02-11 08:48:58 -05:00
Brian Talbot	ed15997259	studio - settings: grading revamp WIP	2013-02-11 08:48:01 -05:00
Chris Dodge	4f67c6c052	quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button.	2013-02-10 16:17:08 -05:00
Brian Talbot	210086fed3	studio - settings: grading revamp WIP	2013-02-08 13:42:36 -05:00
cahrens	98026e4325	A couple minor bug fixes. ... https://edx.lighthouseapp.com/projects/102637/tickets/173 https://edx.lighthouseapp.com/projects/102637/tickets/177	2013-02-08 12:46:32 -05:00
Brian Talbot	1b679750ad	studio - settings: more revamp of tabs to views WIP	2013-02-08 12:36:21 -05:00
Brian Talbot	dc07e7375f	studio - settings: revamp of tabs to views WIP	2013-02-08 09:36:18 -05:00
Don Mitchell	48e582647c	bug 171	2013-02-07 16:24:43 -05:00
Calen Pennington	4f555f6480	Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model ... Conflicts: cms/djangoapps/contentstore/course_info_model.py cms/djangoapps/contentstore/module_info_model.py cms/djangoapps/contentstore/tests/factories.py cms/djangoapps/contentstore/tests/test_course_settings.py cms/djangoapps/contentstore/views.py cms/djangoapps/models/settings/course_details.py cms/djangoapps/models/settings/course_grading.py cms/templates/edit_subsection.html common/djangoapps/mitxmako/shortcuts.py common/djangoapps/static_replace.py common/djangoapps/util/converters.py common/djangoapps/xmodule_modifiers.py common/lib/xmodule/setup.py common/lib/xmodule/xmodule/abtest_module.py common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/discussion_module.py common/lib/xmodule/xmodule/error_module.py common/lib/xmodule/xmodule/html_module.py common/lib/xmodule/xmodule/js/src/video/display.coffee common/lib/xmodule/xmodule/mako_module.py common/lib/xmodule/xmodule/modulestore/mongo.py common/lib/xmodule/xmodule/modulestore/store_utilities.py common/lib/xmodule/xmodule/modulestore/xml.py common/lib/xmodule/xmodule/modulestore/xml_importer.py common/lib/xmodule/xmodule/raw_module.py common/lib/xmodule/xmodule/self_assessment_module.py common/lib/xmodule/xmodule/seq_module.py common/lib/xmodule/xmodule/template_module.py common/lib/xmodule/xmodule/tests/__init__.py common/lib/xmodule/xmodule/tests/test_export.py common/lib/xmodule/xmodule/tests/test_import.py common/lib/xmodule/xmodule/video_module.py common/lib/xmodule/xmodule/x_module.py common/lib/xmodule/xmodule/xml_module.py lms/djangoapps/courseware/access.py lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/grades.py lms/djangoapps/courseware/models.py lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/courseware/views.py lms/djangoapps/django_comment_client/utils.py lms/templates/staff_problem_info.html lms/templates/video.html rakefile	2013-02-07 15:12:30 -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	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	ed42fa8830	studio - soft landing: revised page title structure and values	2013-02-07 14:23:00 -05:00
Brian Talbot	5b9609abf6	studio - soft landing: various fixes/tweaks	2013-02-07 14:09:47 -05:00
Brian Talbot	fedd0aac9a	studio - course nav: added in styling to account for stateful menus	2013-02-07 11:25:11 -05:00
Brian Talbot	903115d6a9	studio - soft landing: refined user icon vs. dropdown icon styles	2013-02-07 11:07:18 -05:00
Don Mitchell	70560d2237	Put DnD back into edit_subsection page	2013-02-07 10:41:37 -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	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	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	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