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
cahrens
c8d6d5d283
Selenium tests.
2013-05-23 11:34:02 -04:00
David Baumgold
c26edbd631
jasmine-jquery compatiblity post-backport
2013-05-23 10:14:47 -04:00
David Baumgold
4736527952
Add Jasmine tests to cover AJAX error notifications
2013-05-22 15:55:56 -04:00
David Baumgold
0a7222b123
Allow an AJAX call to specify that it should not notify on error
...
Because there are some cases where it's OK to fail, and it's not the user's fault
2013-05-22 15:55:56 -04:00
Brian Talbot
2359c43855
studio - revises z-index/element depth levels for modals, notifications, prompts, and alerts to use universal .depth Sass extends
2013-05-22 15:55:56 -04:00
David Baumgold
3738078ce9
Load system feedback template for SectionEdit tests
2013-05-22 15:55:56 -04:00
Brian Talbot
bc6e480103
studio - corrects some errand new icon-based typography rules to use the line-height() mixin
2013-05-22 15:55:55 -04:00
David Baumgold
3cfadb8ae8
Migrated internationalization text into template for section name
2013-05-22 15:55:55 -04:00
Frances Botsford
fa330784d3
removed symbolset, replaced with fontawesome for gradable status; added transform-origin for saving notification animation to remove wobble
2013-05-22 15:55:55 -04:00
David Baumgold
dc2acb18ee
Moved global AJAX Error handler definition to main.coffee
2013-05-22 15:55:55 -04:00
David Baumgold
f3523d805f
Escape section name in Backbone to prevent XSS
2013-05-22 15:55:55 -04:00
Brian Talbot
bb0460cc0d
studio - changes all specific ss-icon-based selectors to use Font Awesome/generic icon- class name in notifications/prompts/alerts Sass
2013-05-22 15:55:55 -04:00
Frances Botsford
4e79d064a0
removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files
2013-05-22 15:55:55 -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
1e7e38824a
Shorten secondary action detection code
2013-05-22 15:55:54 -04:00
David Baumgold
5a06c69289
Add toBeShown and toBeHiding matchers for Jasmine
...
To reduce redundancy in tests
2013-05-22 15:55:54 -04:00
David Baumgold
0052eaacbc
Backbone section: don't save name on validation error
2013-05-22 15:55:54 -04:00
Brian Talbot
7ae534799b
studio - revises error message copy when section name is left blank on outline view
2013-05-22 15:55:54 -04:00
David Baumgold
c628a8a360
Fix test
2013-05-22 15:55:53 -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
David Baumgold
525fe2d581
Expose a dummy gettext function in the Jasmine test env
2013-05-22 15:55:53 -04:00
Brian Talbot
0fd3bb6079
studio - removes the .is-fleeting class/animation that is handled by backbone's min/max time for notifications
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
