Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,193 Commits 1 Branch 0 Tags
bc0e590842e4887fcfe0e10973da15840cd0489d
Commit Graph

86 Commits

Author SHA1 Message Date
David Baumgold
b6e3b0ee03 Refactor Backbone Notifications 
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
 2013-06-18 10:20:31 -04:00
Chris Dodge
cd0087ca53 use the new notification tools for the confirmation dialog 2013-06-17 11:10:35 -04:00
cahrens
a82daf0710 Change to Backbone collection. 2013-05-31 15:59:53 -04:00
cahrens
8fd15ce45d Review feedback. 2013-05-30 14:13:10 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
David Baumgold
9e864834bd Unify system feedback templates 
Also, a SystemFeedback model no longer has a `type`, it has an `intent`. This is
because SystemFeedback views have `type`, as well, and this prevents a naming
collision.
 2013-05-22 15:55:55 -04:00
David Baumgold
a8431eeae2 Section model shouldn't react to AJAX errors 
Doing so overrides the AJAX error popup
 2013-05-22 15:55:53 -04:00
Brian Talbot
02e022ec7b studio - revises the min amount of time the saving notification appears on the outline view 2013-05-22 15:55:53 -04:00
David Baumgold
a0a71c0df2 Internationalization for JS 2013-05-22 15:55:53 -04:00
David Baumgold
fcf4cdc75e Implement minShown and maxShown for notification views 2013-05-22 15:55:51 -04:00
David Baumgold
4af3325976 Move display logic into view 
Model shouldn't know about things like close buttons, visibility, and so on
 2013-05-22 15:55:51 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
David Baumgold
e440580c79 Started writing Backbone tests 
Hacking the Python, because our JS dependency management is borked.
 2013-05-22 15:55:50 -04:00
David Baumgold
1333717871 Message action callbacks have model set to this 2013-05-22 15:55:50 -04:00
David Baumgold
f5f7cf705f Subclass CMS.Models.SystemFeedback 
To create handy WarningMessage, ErrorMessage, and ConfirmationMessage classes
 2013-05-22 15:55:50 -04:00
David Baumgold
c6c5e50d86 Hook up notification framework to default AJAX error callback 
And delete `CMS.ServerError`
 2013-05-22 15:55:49 -04:00
David Baumgold
0dc3446523 Handle saving popup 2013-05-22 15:55:49 -04:00
David Baumgold
5746121f5c Set up Notification and Prompt 2013-05-22 15:55:49 -04:00
David Baumgold
5ff2adb882 Rename alert model to SystemFeedback 2013-05-22 15:55:48 -04:00
David Baumgold
c0d69022cb Set up Backbone model/view for alerts 2013-05-22 15:55:48 -04:00
cahrens
4facd262bd Jasmine test for metadata model. 2013-05-20 16:26:48 -04:00
cahrens
b16e17a250 Some i18n work and other minor cleanup. 2013-05-17 14:57:25 -04:00
cahrens
235ecff28b In progress. 2013-05-16 10:40:48 -04:00
cahrens
17750a7d6d Use min, max, and step values from server. 2013-05-14 14:20:10 -04:00
cahrens
8c36918abf Support display names for choices. 2013-05-13 15:35:55 -04:00
cahrens
5edbf3d8f7 Merge branch 'master' into feature/christina/metadata-ui 2013-05-13 10:55:32 -04:00
cahrens
125c9c13c1 Got clearing of fields working. 2013-05-12 15:45:31 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date). 
https://edx.lighthouseapp.com/projects/102637/tickets/231
 2013-03-25 17:25:49 -04:00
cahrens
a2a1478d92 Fix caching bug on back button. 2013-03-22 09:51:45 -04:00
cahrens
a03f6c3bf1 More Selenium test, code cleanup. 2013-03-19 14:02:07 -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
f6fb64f130 Saving checkbox state, client template for individual checklist. 2013-03-18 15:03:54 -04:00
cahrens
017fd06bfc Pre-merge. 2013-03-14 13:37:22 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04: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
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
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged 
Feature/cas/manual policy merged
 2013-02-27 09:02:07 -08:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the 
save cancel bar.
 2013-02-21 13:27:36 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
Don Mitchell
c9c026be62 Fixed urls 2013-02-12 12:15:07 -05:00
Brian Talbot
7ca267fd78 studio - debugging grading settings JS errors WIP 2013-02-12 11:56:54 -05:00
Don Mitchell
773dfce68d Try to make server and validation errors work together. Getting double 
errors when there are parent and child views both defining on error
handlers still.
 2013-02-11 12:04:45 -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
Don Mitchell
7b3c81ca53 blacklist violations now properly trigger violation error 
delete keys only after save completes
 2013-02-06 17:25:12 -05:00