Commit Graph

439 Commits

Author SHA1 Message Date
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton
move upload asset code for assets to AssetsView
2014-05-23 18:24:24 +05:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
2014-05-22 10:52:00 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
2014-05-21 15:40:31 -04:00
zubiar-arbi
08f313f9b4 move upload code for assets to AssetsView
STUD-1523
2014-05-21 17:15:04 +05:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
2014-05-12 11:35:03 -04:00
polesye
2d64a2773f Fix acceptance tests. 2014-05-12 16:22:05 +03:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:56:43 -04:00
cahrens
37da399997 Update unit test based on changes in master. 2014-05-02 15:09:25 -04:00
cahrens
fb150bcf64 Drag and drop on container page.
STUD-1309
2014-05-02 15:09:15 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Andy Armstrong
a3b2809601 Fix duplicate save and cancel buttons in Studio
STUD-1531

Also add support for refreshing the modal on custom save
2014-04-15 14:04:55 -04:00
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -04:00
Andy Armstrong
2ae28c5db7 Improve unit testing of xblock editing 2014-04-09 10:32:13 -04:00
Andy Armstrong
a6aae729b7 Address the next round of review comments. 2014-04-09 10:32:13 -04:00
Andy Armstrong
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04:00
Andy Armstrong
b779b8a6fb Add unit tests for custom tabs and modal titles 2014-04-09 10:32:13 -04:00
Andy Armstrong
5ab159b079 Try to fix the failing JavaScript test 2014-04-09 10:32:12 -04:00
Andy Armstrong
dce075a852 Changes based upon code review comments 2014-04-09 10:32:12 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
cahrens
aade444f00 Move overview drag and drop code to a utility class. 2014-04-05 17:03:18 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
2014-02-27 14:53:05 -05:00
Giulio Gratta
3ffb6715e5 Internal/External Studio file URLs
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
2014-02-24 11:54:09 -08:00
marco
a8417df7ba styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file. 2014-02-14 12:57:06 -05:00
polesye
faa97379b7 BLD-658: Add view for field type Dict in Studio. 2014-02-11 14:53:57 +02:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page
Added sorting to the new pagination logic for STUD-995.
2014-01-08 10:35:40 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
polesye
b4f82b3837 BLD-438: Fix clear and download buttons. 2013-12-05 11:43:29 +02:00
cahrens
5fdfc60957 Change video transcripts to use locators instead of locations.
Part of STUD-870
2013-11-26 16:52:56 -05:00
Zubair Afzal
783e4b223f Show error on invalid html in course handout edit + Added tests
STUD-293
2013-11-20 17:33:07 +05:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Frances Botsford
ff52afbd79 i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button 2013-10-16 16:26:09 -04:00
Frances Botsford
f90e336b18 updated grading help text on weight of total grade to be more clear that it should be an integer without the percent sign 2013-10-16 15:52:05 -04:00
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
Frances Botsford
79c2cdc7ba switching studio assets lock to use checkbox instead of link 2013-09-25 17:29:47 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets.
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
2013-09-20 10:44:54 -04:00
David Baumgold
d984311b2e Remove references to template loader JS library 2013-09-06 09:59:56 -04:00
Peter Fogg
9632f4fed8 Address PR comments:
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
2013-08-21 09:42:00 -04:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Brian Talbot
99458e7223 Studio: revises visual layout/presentation of multi-value metadata fields 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 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
David Baumgold
372992244c Removed course_info_handouts AJAX load 2013-07-29 14:30:16 -04:00
David Baumgold
5b9e283552 Load course info update template on page instead of via AJAX 2013-07-29 14:29:04 -04:00
David Baumgold
eac14615cd Load advanced_entry template on page, rather than via AJAX 2013-07-29 14:28:40 -04:00
David Baumgold
ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" 2013-07-22 12:54:31 -04:00
Peter Fogg
871ab87bf2 Fix saving notification CSS. 2013-07-12 09:01:03 -04:00