cahrens
599a215ad0
Move includes to right place.
2013-05-27 19:36:02 -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
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
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
dc2acb18ee
Moved global AJAX Error handler definition to main.coffee
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
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
c6c5e50d86
Hook up notification framework to default AJAX error callback
...
And delete `CMS.ServerError`
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
cahrens
b16e17a250
Some i18n work and other minor cleanup.
2013-05-17 14:57:25 -04:00
marco
47a4d6b6a1
initial polyfill implementation and metadata number entry javascript validation
2013-05-14 23:55:34 -04:00
marco
8d8c8d83df
updated unit styling, added polyfill js library, updated javascript handling for modes swap
2013-05-14 12:38:52 -04:00
cahrens
125c9c13c1
Got clearing of fields working.
2013-05-12 15:45:31 -04:00
cahrens
f4b06b2e96
Beginnings of is-set work.
2013-05-10 16:41:07 -04:00
cahrens
b314b5ce59
Renaming of some files.
2013-05-09 14:51:16 -04:00
cahrens
bfdbcc2f32
Beginnings of Backbone views/models.
2013-05-09 11:16:12 -04:00
Chris Dodge
d807b955f7
add leading slash to the jsi18n include
2013-05-01 15:27:36 -04:00
Steve Strassmann
cdfd7c807f
fix bad url for jsi18n
2013-04-29 17:13:24 -04:00
Steve Strassmann
8baddc0645
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
2013-04-24 10:41:09 -04:00
Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Brian Talbot
512e4fe3bd
resolving local merge with master and sprucing style and templates for merge with master
2013-04-05 15:13:21 -04:00
Christina Roberts
33d39a85a9
Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
...
Studio Help Sock
2013-04-05 11:37:57 -07:00
Brian Talbot
3c3a6e7503
studio - adding in view-based banners UI tweaks and removing global banner UI for now
2013-04-04 16:46:38 -04:00
Mark L. Chang
8439013f64
studio: added segment.io tracking
2013-04-04 01:51:14 -04:00
Brian Talbot
d87c4e3866
resolving local merge with master
2013-04-03 15:01:55 -04:00
Brian Talbot
65768e813b
resolving local merge conflict
2013-04-03 10:00:38 -04:00
Mark L. Chang
1d70509da1
fixed merge on env
2013-04-03 00:31:48 -04:00
Mark L. Chang
43f6f0ce8f
put survey behind MITX_FEATURES flag
2013-04-03 00:28:08 -04:00
Mark L. Chang
5df7f41c8f
added net promoter score tracking javascript shim from Qualaroo
2013-04-03 00:28:08 -04:00
Brian Talbot
8b9ecd9367
studio - reverting footer UI to existing
2013-04-02 12:53:11 -04:00
Brian Talbot
57e5eb683b
studio - basic design, interaction, and content for static in-page help
2013-04-01 16:54:56 -04:00
Brian Talbot
c8ab45cc57
studio - footer help ui revamp - animation, structure, styling - WIP
2013-03-27 17:40:24 -04:00
Brian Talbot
6889b2015b
studio - added in revised footer styles and fix for smoothscroll
2013-03-27 01:24:31 -04:00
Brian Talbot
175e1b46e9
studio - in progress styling of tender help widget
2013-03-26 08:32:49 -04:00
Brian Talbot
66ba0f9b81
studio - resolving local merge with master
2013-03-25 15:21:25 -04:00
Brian Talbot
38df54dc53
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
2013-03-20 16:19:45 -04:00
Brian Talbot
c901cecdea
studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh.
2013-03-18 16:23:30 -04:00
