Commit Graph

1707 Commits

Author SHA1 Message Date
Christina Roberts
dfed60fa8c Merge pull request #3163 from edx/christina/advanced-settings-font
Use monospaced font for CodeMirror editor.
2014-04-03 14:58:56 -04:00
cahrens
3d7915fa56 Use monospaced font for CodeMirror editor.
Cursor position gets off with non-monospaced font.
STUD-1456.

Vertical alignment of monospace font in advanced settings via position css adjustment
2014-04-03 13:11:08 -04:00
Christina Roberts
d6a0d6f06c Merge pull request #3180 from edx/christina/iframe_binding_bug
Check iframe src for the specific value TinyMCE uses.
2014-04-03 10:11:43 -04:00
zubair-arbi
048962874e Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings
Fixed studio can't handle more than 9 lines in advanced settings.
2014-04-03 18:42:39 +05:00
cahrens
cc275a9347 Check iframe src for the specific value TinyMCE uses.
STUD-1470
2014-04-02 13:48:13 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

Change the event handling for image plugin.

Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
Waheed Ahmed
19e9ff7cb3 Fixed studio can't handle more than 9 lines in advanced settings.
STUD-1483
2014-04-01 15:36:15 +05:00
Mark Hoeber
8452ee7c0d Merge pull request #3132 from edx/markhoeber/documentation/stud-1488
Added note about pages being publicly viewable
2014-03-31 16:19:08 -04:00
Frances Botsford
a01d296d1c moved Studio public Pages warning to a more prominent location 2014-03-31 13:42:06 -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
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page.
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
2014-03-28 05:41:32 -04:00
Brian Talbot
3b0f71482e Studio - revising markup, templates and styling for page editing UI:
* added in fixed state markup/logic
* added in collection markup/logic
* revised styling for page titles, collection, and fixed elements
2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE.
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
2014-03-26 11:06:59 -04:00
Andy Armstrong
a37d2c1b93 Fix Studio's XBlock dependency loading issues
STUD-1465

Changed the XBlock rendering logic to use promises to track asynchronous tasks.
Each dependency is then only loaded once the previous one has completed, and the
XBlock initialization only happens once all dependencies are loaded. This gives
XBlocks the same semantics in Studio as they get when shown directly on a page.
2014-03-25 16:36:06 -04:00
Andy Armstrong
f3c23e89d5 Merge pull request #3027 from edx/andya/asset-loading-indicator
Add a loading indicator to the Files & Uploads page.
2014-03-24 11:53:38 -04:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade
Upgrade TinyMCE and switch to CodeMirror plugin
2014-03-24 11:53:17 -04:00
Andy Armstrong
f92c337235 Add a loading indicator to the Files & Uploads page. 2014-03-24 10:51:36 -04:00
Mark Hoeber
d752894604 Update to page help on new Pages page in Studio
STUD-1458

Modified the edit-tabs template and the preview-lms-staticpages image
used in the modal.
2014-03-21 16:33:26 -04:00
Frances Botsford
9054c621fc keeping the component editor inside the component window 2014-03-21 15:47:32 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Frances Botsford
91c0b8ee86 UX changes for course navigation manipulation 2014-03-21 13:18:31 -04:00
polesye
790d359b89 BLD-581: add highlighting of entire field on focus. 2014-03-20 13:40:11 +02:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Frances Botsford
b59d7ba9ec first stab at publishing status for the container page 2014-03-12 19:33:52 +00:00
Waheed Ahmed
f16efbb285 Don't close modal on click outside new course update modal.
STUD-1404
2014-03-11 17:53:27 +05:00
marco
f50e58ad7f adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling
STUD-1410
2014-03-10 16:39:46 -04:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -05:00
cahrens
9b2a78b12d Increase max-width for breadcrumb trail. 2014-03-05 12:06:37 -05:00
cahrens
0dbabc7ad8 Support xblocks with children on the container page.
STUD-1363
2014-03-04 17:11:01 -05:00
Will Daly
a6d0c78d3f Merge pull request #2785 from edx/will/studio-oa-validation-fix
Studio OA validation dialog
2014-03-04 08:00:42 -05:00
Dave St.Germain
601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader
Upgrade CodeMirror to 3.21.0
2014-03-03 17:57:46 -05:00
marco
17e95f184a bug fix for HTML xmodule styling which caused first line of text to be cut off. STUD-1380 2014-03-03 11:18:57 -05:00
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
Dave St.Germain
08fadac817 Upgrade CodeMirror to 3.21.0 (with accessibility changes from
http://bgrins.github.io/codemirror-accessible/)
LMS-1802
2014-02-28 13:44:34 -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
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save
Native XBlock Studio Save UI
2014-02-27 10:50:51 -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
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
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
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
marcotuts
1b4388ee08 updated container header styling and exposed sidebar back to its location. includes some javascript to render tooltips on overflowed text headers 2014-02-14 11:47:14 -05:00
Andy Armstrong
70ba10433e Couple more changes 2014-02-14 11:47:14 -05:00
Andy Armstrong
c5fc30c58b First rough cut of a container page. 2014-02-14 11:47:14 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
2014-02-13 12:53:47 -05:00