Commit Graph

1185 Commits

Author SHA1 Message Date
David Baumgold
ddc986f775 Call event.preventDefault() on notification action buttons
But allow you to specify that the event should not be prevented
2013-06-25 11:29:42 -04:00
Peter Fogg
ad09236c82 Merge pull request #242 from edx/peter-fogg/advanced-backbone-notifications
Refactor Advanced Settings page to use Backbone notifications.
2013-06-24 12:37:26 -07:00
Peter Fogg
fb573a1db6 Hide "success" alert as soon as we start editing another field. 2013-06-24 13:59:14 -04:00
David Baumgold
72ffe2d8f2 Backbone notifications secondary actions
Handle secondary actions on notifications either specified as a single object,
or as a list of objects. Under the hood, the initialize method converts a single
object to a list containing a single object.
2013-06-24 13:44:50 -04:00
Peter Fogg
3e376bd780 Prevent "saved" and "error" views from showing at the same time.
Previously the "saved" view was never hidden, even after more data was
edited. So if one field was saved successfully and then another was
not, we would find ourselves in the unfortunate situation of seeing
both views at once, leading to much confusion.
2013-06-24 11:06:53 -04:00
Peter Fogg
72e08456a8 Refactor Advanced Settings page to use Backbone notifications. 2013-06-24 09:48:37 -04:00
cahrens
ad6e745762 Forgot to remove registration of onKeyUp function. 2013-06-24 09:09:05 -04:00
cahrens
250de3fcb6 Remove keybinding for work in progress (WIP).
STUD-329
2013-06-21 17:13:06 -04:00
cahrens
d601cee8e5 Merge branch 'master' into christina/course-settings-drupal 2013-06-20 11:00:12 -04:00
Brian Talbot
604e820211 studio - revises styling of in-context notices UI 2013-06-20 09:23:56 -04:00
Brian Talbot
4ddca36bbe Studio - adds minor UI/content changes to settings notices 2013-06-19 18:13:54 -04:00
Brian Talbot
d2f0d85085 studio - adds in basic rules for notices UI 2013-06-19 18:09:09 -04:00
David Baumgold
687779ba34 Clean up assets page notifications
Remove hack to work around multiple notification click issues -- and actually resolve
the issue so that the hack isn't necessary
2013-06-19 12:01:44 -04:00
David Baumgold
02626ffda7 Removed unused test code 2013-06-18 11:27:13 -04:00
David Baumgold
fb0d16afe2 Only show at most 300 chars in AJAX error notification 2013-06-18 10:23:44 -04:00
David Baumgold
aa24508024 Add underscore.string library
http://epeli.github.io/underscore.string/
2013-06-18 10:23:18 -04:00
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
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click
Bug fix for LaTeX source not saving
2013-06-17 13:36:49 -07:00
Chris Dodge
16e476e8e4 refactored asset page related JS into it's own page 2013-06-17 11:10:36 -04:00
Chris Dodge
cd0087ca53 use the new notification tools for the confirmation dialog 2013-06-17 11:10:35 -04:00
Chris Dodge
274d8997a2 update warning message 2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
cahrens
21dc4d863e Put back in some older code to save source_code property. 2013-06-14 14:10:40 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Chris Dodge
be6fbf913e make local variable 2013-06-11 14:36:04 -04:00
Chris Dodge
1602f592b4 use better API 2013-06-11 14:32:33 -04:00
Chris Dodge
fa8ae228bf Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function 2013-06-11 13:38:01 -04:00
Peter Fogg
779f86c440 Merge pull request #46 from edx/peter-fogg/single-click-video-creation
Peter fogg/single click video creation
2013-06-04 11:08:40 -07:00
Brian Talbot
3bcbc9f979 studio - replaces iconography for advanced component button within the unit view 2013-06-04 11:26:16 -04:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
Peter Fogg
cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation 2013-06-03 09:15:52 -04:00
marco
67a29ea94a hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div 2013-06-02 12:48:54 -04:00
cahrens
4d311f44cd Code review feedback. 2013-06-01 18:46:09 -04:00
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -04:00
cahrens
486d085d1e Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-31 16:00:09 -04:00
cahrens
a82daf0710 Change to Backbone collection. 2013-05-31 15:59:53 -04:00
Peter Fogg
56ed47b37f Allow single-click video creation. 2013-05-31 12:52:53 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
cahrens
8fd15ce45d Review feedback. 2013-05-30 14:13:10 -04:00
cahrens
c0c5e920a3 Go back to setFixtures. 2013-05-30 12:56:55 -04:00
cahrens
5d41e2a952 Updates from code review. 2013-05-30 12:26:01 -04:00
cahrens
f0260757c5 Cleanup. 2013-05-29 16:50:22 -04:00
cahrens
7d07309f9d Don't call setFixtures. Can stomp on other tests. 2013-05-29 14:03:16 -04:00
cahrens
24707f8f85 Jasmine test for views. 2013-05-29 12:09:42 -04:00
cahrens
625c6b518c Cleanup, change how we load templates. 2013-05-28 14:07:35 -04:00
marco
c0aef206ae Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui 2013-05-24 09:49:57 -04:00
Frances Botsford
8b76afb938 converted undo image in component settings list to FontAwesome 2013-05-24 08:51:14 -04:00
Brian Talbot
7940ca54ad studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. 2013-05-23 13:27:22 -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