cahrens
065e850449
Merge with Brian's changes.
2013-03-14 09:32:54 -04:00
cahrens
e0207432ca
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
16f6744aef
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
2013-03-13 19:13:26 -04:00
Brian Talbot
bf71f099d4
studio - checklists: finished static styling, initial checklist content import, and some basic JS
2013-03-13 14:09:18 -04:00
Brian Talbot
66a8735a58
studio - Checklists: initial design and front end proofing/firming up - WIP
2013-03-13 10:50:34 -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
Don Mitchell
6922152165
Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge
...
Advanced Settings changes.
2013-03-12 09:13:16 -07:00
cahrens
eea5900591
Add in Mark's copy changes.
2013-03-12 11:15:50 -04:00
Calen Pennington
2a96c45677
Make default value for format setting None, and force lms and cms to be explicit about a string default
2013-03-12 10:16:14 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -04:00
cahrens
84f2137935
Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp
2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
Calen Pennington
4cea094f70
Be a little more liberal with what count's as not having a due date in a section
2013-03-11 15:29:58 -04:00
Brian Talbot
82a00104c2
studio - settings: revised markup and styling around disabled/readonly fields
2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
2013-03-11 11:40:36 -04:00
Brian Talbot
72a7ec9e07
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
2013-03-11 11:31:48 -04:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Brian Talbot
559a311acb
studio - alerts: refactored static alerts demo view to have a different template/view/url name to help with user facing views vs. documentation views
2013-03-07 11:37:15 -05:00
Calen Pennington
af3c92c47e
Remove old cms templates
2013-03-06 17:28:25 -05:00
Calen Pennington
ba69392f70
Fix inaccurate instructions around import
2013-03-06 17:10:45 -05:00
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Brian Talbot
9a7b6c7eaf
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-06 15:04:34 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
cahrens
b706d4a1f5
Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
...
#225
2013-03-06 11:50:23 -05:00
Brian Talbot
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Brian Talbot
cbdf9ea25b
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
2013-03-05 09:57:14 -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
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -05:00
Brian Talbot
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
2013-03-03 20:44:48 -05:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Brian Talbot
2ce4ecbc84
local merge with master - finished
2013-03-01 15:48:15 -05:00
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47:23 -05:00
Brian Talbot
ad70581b80
studio - alerts: more progress including prompts
2013-03-01 15:43:07 -05:00
Don Mitchell
5fa1da5324
Merge pull request #1577 from MITx/bug/christina/misc
...
Bug fix for #215 (quotes not rendering in text fields).
2013-03-01 12:09:20 -08:00
cahrens
29330cc922
Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.
...
#213
2013-03-01 14:55:38 -05:00
cahrens
d001f21bfe
Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow.
2013-03-01 14:39:49 -05:00
Christina Roberts
69ef622afd
Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
...
Fix latex high-level source editor in current version of cms / studio
2013-02-28 10:02:09 -08:00
ichuang
b75ccbdcce
address Christina's comments re js in latex2edx source-edit.html
2013-02-28 04:21:43 +00:00
Brian Talbot
cb456ad228
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
2013-02-27 12:45:44 -05:00
Brian Talbot
0926395445
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
2013-02-26 12:32:20 -05:00
Brian Talbot
95ea01689f
studio - alerts: firmed up status-based notifications
2013-02-25 16:30:36 -05:00
Brian Talbot
d809df913d
studio - alerts: moved all states and documentation into new /alerts view
2013-02-25 14:45:27 -05:00
Brian Talbot
8179b9fadc
studio - alerts: initial pass at alert styling and markup complete
2013-02-25 14:19:22 -05:00
ichuang
b6cf206fc7
fix latex high-level-source editor
2013-02-24 01:55:57 +00:00
Brian Talbot
60f803f369
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:29:19 -05:00
Brian Talbot
bb24a079a1
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:28:13 -05:00
