David Baumgold
|
04ddb63dad
|
i18n the studio nav help button
|
2013-07-12 16:27:54 -04:00 |
|
David Baumgold
|
a6f349dab9
|
Studio i18n
|
2013-07-12 16:25:39 -04:00 |
|
David Baumgold
|
0673c79f28
|
i18n
|
2013-07-09 19:16:05 -04:00 |
|
David Baumgold
|
3d61c6294c
|
Stubbed out textbooks index page
|
2013-07-09 19:15:58 -04:00 |
|
Brian Talbot
|
391ebb7d93
|
studio - removes Studio Help from account-based nav
|
2013-07-02 00:11:25 -04:00 |
|
Brian Talbot
|
251e775659
|
studio - makes course org/number/name block an entire link
|
2013-07-02 00:10:18 -04:00 |
|
Brian Talbot
|
2a5c55189e
|
studio - plans for/truncates long usernames in main nav
|
2013-07-01 18:46:12 -04:00 |
|
Brian Talbot
|
41fa73b695
|
studio - wraps nav elements in floated containers for easier layout
|
2013-07-01 17:32:18 -04:00 |
|
Brian Talbot
|
d592348a07
|
studio - abstracts and animates main nav dropdown icons
|
2013-07-01 17:32:17 -04:00 |
|
Brian Talbot
|
2a04eeec46
|
studio - revises studio nav visually and adds help links
|
2013-07-01 17:32:16 -04:00 |
|
Brian Talbot
|
51f96ad77c
|
studio - revises button styling/states for primary nav
|
2013-07-01 17:32:16 -04:00 |
|
Brian Talbot
|
f98f500c6f
|
studio - sets initial studio nav revisions (WIP)
|
2013-07-01 17:32:16 -04:00 |
|
David Baumgold
|
5746121f5c
|
Set up Notification and Prompt
|
2013-05-22 15:55:49 -04:00 |
|
David Baumgold
|
c0d69022cb
|
Set up Backbone model/view for alerts
|
2013-05-22 15:55:48 -04:00 |
|
Brian Talbot
|
2be2e2f20d
|
studio - plumbs in Font Awesome icons into header dropdown menus and user nav
|
2013-05-22 15:55:47 -04:00 |
|
Brian Talbot
|
8a4047d5dd
|
studio - added smoothscroll to top of view and wired footer tender widget link
|
2013-03-26 12:48:51 -04:00 |
|
cahrens
|
be4045cb86
|
Reduce pep8 warnings, move Checklistst to top of menu.
|
2013-03-21 22:17:46 -04:00 |
|
cahrens
|
6d6e144c35
|
Urls working.
|
2013-03-20 16:37:08 -04:00 |
|
cahrens
|
49ee903eda
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
|
2013-03-18 15:30:19 -04:00 |
|
cahrens
|
54156b7ac1
|
Saving work.
|
2013-03-14 09:22:58 -04:00 |
|
Brian Talbot
|
1b5f040021
|
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
|
2013-03-12 21:57:40 -04:00 |
|
Calen Pennington
|
93db5acc15
|
Make display_name defaulting explicit
|
2013-03-08 14:58:09 -05:00 |
|
Calen Pennington
|
1bfb933518
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
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_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
|
2013-03-04 16:33:40 -05:00 |
|
Brian Talbot
|
7b60ec380a
|
Merge branch 'master' into feature/cas/manual-policy-merged
|
2013-02-20 14:58:50 -05:00 |
|
cahrens
|
167d07037d
|
Merged, delete Ace.
|
2013-02-19 14:56:37 -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 |
|
Brian Talbot
|
fccb3d7a73
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:36:36 -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
|
3eead4701b
|
studio - settings: hiding link to advanced settings for now
|
2013-02-11 15:59:10 -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
|
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 |
|
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
|
bb789e758b
|
studio - course nav: general flex-grid layout - WIP
|
2013-02-06 09:57:03 -05:00 |
|
Brian Talbot
|
8bb5cc1c23
|
studio - course nav: added in root link to main nav
|
2013-02-05 11:50:58 -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 |
|
Brian Talbot
|
4946eace2a
|
studio - soft landing UI: sign in and basic styling/layout tweaks
|
2013-02-04 00:43:24 -05:00 |
|
Brian Talbot
|
1144b0eeed
|
studio - soft landing UI: initial header and templating work
|
2013-02-03 22:22:11 -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 |
|
Calen Pennington
|
cbfc7b201a
|
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
|
2012-12-28 14:44:31 -05:00 |
|
Brian Talbot
|
ed3f3b02d6
|
studio - course export UI alpha - roughing in states/views
|
2012-12-26 09:10:05 -05:00 |
|
Chris Dodge
|
91b0fddfce
|
malformed url generation for User's tab
|
2012-12-19 13:49:47 -05:00 |
|
Brian Talbot
|
af5d007a8f
|
cms - added users tab back into course navigation
|
2012-12-18 12:50:04 -05:00 |
|
Chris Dodge
|
bb3b7cb3a9
|
add back the course info tab in the CMS
|
2012-12-13 16:28:47 -05:00 |
|