Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,968 Commits 1 Branch 0 Tags
32ea61857dfdcc7794637ae67cf174ec51ec2970
Commit Graph

190 Commits

Author SHA1 Message Date
Will Daly
a1f3db772c Continue showing edit dialog until saving is complete to allow user to correct validation errors. 2014-03-03 09:08:35 -05:00
Will Daly
fe4be011af Add error notification for XBlocks in Studio 2014-02-27 16:54:19 -05: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
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio 
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
 2014-02-26 16:17:02 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Calen Pennington
1eec47a604 Fix STUD-1316 
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
 2014-02-19 14:58:41 -05:00
Adam Palay
f4c6bd1bad Revert "If unit display name is non-empty string, change it to a defaul (STUD-1284)" 
This reverts commit b8da1c5bb7.
 2014-02-05 13:07:33 -05:00
Adam Palay
b8da1c5bb7 If unit display name is non-empty string, change it to a defaul (STUD-1284) 2014-02-05 13:05:26 -05:00
Calen Pennington
f6731342de Make Studio load XBlock fragment js and css on the client-side 
[LMS-1421][LMS-1517]
 2014-02-04 15:38:13 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
cahrens
5da8de018e Don't pass variables to gettext. 2014-01-22 14:39:27 -05:00
cahrens
b5726a6889 Front-end work for duplicating components on the unit page. 
STUD-1186
 2014-01-22 10:43:51 -05:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL. 
STUD-848
 2013-11-19 16:56:24 -05:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL. 
Part of STUD-847.
 2013-11-14 11:03:31 -05:00
Christina Roberts
cd868efc22 Merge pull request #1580 from edx/christina/item 
Change delete_item to RESTful URL.
 2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
David Baumgold
b119a90996 Do JS setup immediately when possible 2013-11-04 12:40:14 -05:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Christina Roberts
b00d59edf1 Merge pull request #1354 from edx/christina/overview-modal 
Pull modal cover and date utils into their own files.
 2013-10-24 11:32:35 -07:00
cahrens
52f4f6afbc Pull modal cover and date utils into their own files. 
Move overview-specific functions into overview.js.
 2013-10-23 15:44:58 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
David Baumgold
76e6f8bc0d Fix up Tender load order 
So that tender_widget.js loads after we've defined window.Tender
 2013-10-16 17:25:58 -04:00
cahrens
37dcfd7bdd Remove commented out code. 2013-10-15 12:52:58 -04:00
David Baumgold
fb01d8fa81 Fixes to avoid CSRF error in acceptance tests 2013-10-11 17:11:59 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
David Baumgold
fd8b375f3a Translated … 2013-09-06 09:17:19 -04:00
Peter Fogg
75b76b37ef Add delete confirmation to static pages. 
We used to use a regular JS `confirm`; this makes the UI consistent
with the rest of Studio.
 2013-08-22 16:41:07 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
Brian Talbot
ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions 2013-07-22 11:37:09 -04:00
Peter Fogg
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -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
404c36b8f4 PDF textbooks: namespace JS variables for URLs 2013-07-09 19:16:07 -04:00
David Baumgold
e0eec89e09 Truncate AJAX error messages in notification 2013-07-09 19:15:59 -04:00
David Baumgold
ace8914a53 Set up Backbone models/views to construct logic of adding textbooks/chapters 2013-07-09 19:15:58 -04:00
David Baumgold
7824b8c8f2 Fix coffeescript issue on Linux 
On Linux, coffeescript refuses to compile unless the `catch` keyword has an error
variable to bind to. On Mac, it works just fine either way. Go figure.
 2013-07-01 15:09:41 -04:00
David Baumgold
1fee805c9a Adjust indentation to make coffeescript happy 2013-07-01 15:09:41 -04:00
David Baumgold
8bfcbb6675 Make notifyOnError handler try to parse response as JSON 2013-07-01 15:09:41 -04:00
David Baumgold
fb0d16afe2 Only show at most 300 chars in AJAX error notification 2013-06-18 10:23:44 -04:00
David Baumgold
b6e3b0ee03 Refactor Backbone Notifications 
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
 2013-06-18 10:20:31 -04:00
cahrens
21dc4d863e Put back in some older code to save source_code property. 2013-06-14 14:10:40 -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
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -04:00