Anton Stupak
dad9f26a99
Make VideoAlpha out of Alpha.
2013-08-12 14:31:48 +03:00
chrisndodge
ece4ec3f57
Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls
...
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
2013-08-08 06:32:35 -07:00
Peter Fogg
f317244ac4
Convert Video Alpha to metadata-only.
2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f
Add a list view for metadata editor.
...
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
2013-08-06 13:23:33 -04:00
Chris Dodge
da9a4b5d4f
alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors
2013-08-05 16:15:03 -04:00
Alexander Kryklia
da4f295d00
Add TabsEditingDescriptor for VideoAlpha
...
Updates comment
Make Model descriptor class property.
Fix tests
2013-08-05 13:38:32 +03:00
Chris Dodge
3a2bb7ba01
add escaping
2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30
resolve merge conflicts
2013-08-02 09:41:02 -04:00
David Baumgold
21a32370df
Reorganize URLs and views around course team
...
Match other views better, saner URLs, more RESTful style, extensible for other roles
2013-07-29 13:11:48 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
David Baumgold
04ddb63dad
i18n the studio nav help button
2013-07-12 16:27:54 -04:00
David Baumgold
a6f349dab9
Studio i18n
2013-07-12 16:25:39 -04:00
David Baumgold
0673c79f28
i18n
2013-07-09 19:16:05 -04:00
David Baumgold
3d61c6294c
Stubbed out textbooks index page
2013-07-09 19:15:58 -04:00
Brian Talbot
391ebb7d93
studio - removes Studio Help from account-based nav
2013-07-02 00:11:25 -04:00
Brian Talbot
251e775659
studio - makes course org/number/name block an entire link
2013-07-02 00:10:18 -04:00
Brian Talbot
2a5c55189e
studio - plans for/truncates long usernames in main nav
2013-07-01 18:46:12 -04:00
Brian Talbot
41fa73b695
studio - wraps nav elements in floated containers for easier layout
2013-07-01 17:32:18 -04:00
Brian Talbot
d592348a07
studio - abstracts and animates main nav dropdown icons
2013-07-01 17:32:17 -04:00
Brian Talbot
2a04eeec46
studio - revises studio nav visually and adds help links
2013-07-01 17:32:16 -04:00
Brian Talbot
51f96ad77c
studio - revises button styling/states for primary nav
2013-07-01 17:32:16 -04:00
Brian Talbot
f98f500c6f
studio - sets initial studio nav revisions (WIP)
2013-07-01 17:32:16 -04:00
cahrens
5d41e2a952
Updates from code review.
2013-05-30 12:26:01 -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
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
Vik Paruchuri
cef401f246
Swap icon to icon-table
2013-05-24 16:20:59 -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
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
5746121f5c
Set up Notification and Prompt
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
Frances Botsford
88dd9244f3
removed symbolset, replaced with fontawesome for sock and static pages
2013-05-22 15:55:48 -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
Vik Paruchuri
fd6da08a97
Fix text
2013-05-21 00:26:39 -04:00
Vik Paruchuri
1f34561cff
Update examples, fix parsing error, avoid collision with capa template
2013-05-21 00:22:33 -04:00
Vik Paruchuri
ed2c1cf0d1
Remove header from cheatsheet
2013-05-20 11:46:01 -04:00
Vik Paruchuri
55fda26fd8
Fix tests, fix xqueue error, minor polish
2013-05-20 11:29:19 -04:00
Vik Paruchuri
d4b54ceca7
Update open ended editor to parse tasks properly
2013-05-20 10:49:04 -04:00
Vik Paruchuri
986999c62e
Fix cheatsheet, start working on xml replacement
2013-05-20 09:50:15 -04:00
Vik Paruchuri
9a7006473e
Do basic work on a simple editor for combinedopenended
2013-05-20 09:07:03 -04:00
cahrens
b16e17a250
Some i18n work and other minor cleanup.
2013-05-17 14:57:25 -04:00
marco
ef14155306
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
2013-05-16 09:50:16 -04:00
marco
bbb6a3c60d
resolved metadata-edit conflict, adding in latex item into settings
2013-05-15 16:27:04 -04:00
marco
12dae84a07
commented out firefox polyfill ad well as xmodule css editor changes
2013-05-15 16:07:45 -04:00
cahrens
d35b29031f
Clean up editable_metadata_fields.
2013-05-15 14:01:18 -04:00
marco
04bb7335e7
removed extra section heading in settings DOM, placed settings after editor
2013-05-10 13:18:43 -04:00
cahrens
4a7f7d6537
Update the other templates that include metadata-edit.html.
2013-05-09 14:34:52 -04:00
