Chris Dodge
62bacea371
use the right link to the login page in a particular use case: clicking activation email when not logged in
2013-05-31 11:10:14 -04:00
cahrens
e6dfa8e81c
Merge branch 'master' into feature/christina/metadata-ui
2013-05-31 09:46:17 -04:00
David Baumgold
4f1e6c484e
Put the advanced settings notifications back in
2013-05-30 15:08:40 -04:00
cahrens
8fd15ce45d
Review feedback.
2013-05-30 14:13:10 -04:00
cahrens
5d41e2a952
Updates from code review.
2013-05-30 12:26:01 -04:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
cahrens
4920f08d2a
i18n
2013-05-29 15:15:31 -04:00
cahrens
7d07309f9d
Don't call setFixtures. Can stomp on other tests.
2013-05-29 14:03:16 -04:00
cahrens
625c6b518c
Cleanup, change how we load templates.
2013-05-28 14:07:35 -04:00
cahrens
6be9463eca
Cleanup.
2013-05-27 21:50:56 -04:00
cahrens
851ed6722a
Continue merge.
2013-05-27 20:28:56 -04:00
cahrens
17c710af83
Merge branch 'master' into feature/christina/metadata-ui
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
2013-05-27 20:08:09 -04:00
cahrens
599a215ad0
Move includes to right place.
2013-05-27 19:36:02 -04:00
Vik Paruchuri
cef401f246
Swap icon to icon-table
2013-05-24 16:20:59 -04:00
cahrens
87d904cb35
Merge branch 'master' into feature/christina/metadata-ui
...
Conflicts:
cms/templates/base.html
2013-05-24 16:10:34 -04:00
Vik Paruchuri
9cbb4e090d
Swap icons for font awesome
2013-05-24 14:40:33 -04:00
Vik Paruchuri
5050eab74a
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-24 14:26:33 -04:00
Frances Botsford
dfb623a29f
removed old icon css and js files and references that are no longer needed
2013-05-24 09:01:15 -04:00
David Baumgold
082e24c634
Removed references to server_error.js
2013-05-23 12:09:12 -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
3cfadb8ae8
Migrated internationalization text into template for section name
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
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
9a61663dce
Restore HTML escaping in Mako template
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
55cd8afe34
Fixing copy for default server error message on notification
2013-05-22 15:55:54 -04:00
Brian Talbot
52b10df805
studio - revises copy of server error notification to include a default message and removes associated actions from notifications
2013-05-22 15:55:53 -04:00
David Baumgold
a0a71c0df2
Internationalization for JS
2013-05-22 15:55:53 -04:00
David Baumgold
8e384a73be
Remove proof-of-concept page
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
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
4e41c8060b
Changed validation error to use new messaging framework
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
e2f5acef46
Turn course sections into Backbone models
...
Hook up course name edit interaction, with notification framework
2013-05-22 15:55:49 -04:00
David Baumgold
772be3b8b3
Make the system feedback template more generic
...
Not that it really matters, since the changes are invisible :)
2013-05-22 15:55:49 -04:00
David Baumgold
355162c7f6
Handle fleeting notifications
2013-05-22 15:55:49 -04:00
David Baumgold
0dc3446523
Handle saving popup
2013-05-22 15:55:49 -04:00
David Baumgold
91cdb1e3df
Use "class" instead of "cls"
...
Matching docstring in feedback.js models
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
5c2116a4b3
Make abstract view, make Alert inherit from it
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
David Baumgold
7e22278fcb
Simplify Youtube API script link
2013-05-22 15:55:48 -04:00
Frances Botsford
9effdc57b1
removed symbolset, replaced with fontawesome for settings
2013-05-22 15:55:48 -04:00
Frances Botsford
571ebb1fcd
removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons
2013-05-22 15:55:48 -04:00
Frances Botsford
88dd9244f3
removed symbolset, replaced with fontawesome for sock and static pages
2013-05-22 15:55:48 -04:00
Frances Botsford
81cb921e32
removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style
2013-05-22 15:55:48 -04:00
Frances Botsford
9a62433797
removed symbolset, replaced with fontawesome for asset upload
2013-05-22 15:55:47 -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
