Commit Graph

237 Commits

Author SHA1 Message Date
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings.
STUD-302, STUD-303
2014-06-26 16:54:22 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes
STUD-1658
2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations
STUD-1658
2014-06-20 11:41:22 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module.
STUD-1529
2014-06-05 12:16:16 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules
STUD-1312
2014-05-29 14:02:45 -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
Frances Botsford
f2d8894118 fix for modal appearing off-screen 2014-05-20 14:13:51 -04:00
frances botsford
3530721671 Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout
Fix for Studio 404 and 500 page layouts
STUD-864
2014-05-06 11:44:51 -04:00
Frances Botsford
fb4cab435e fix for Studio 404 and 500 page layouts
STUD-864
2014-05-02 16:19:59 -04:00
Frances Botsford
fd7142bcde dnd container page styling 2014-05-02 15:09:23 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Brian Talbot
5940f1ff1a Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style

LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

Studio: adding in basic action Sass placeholder for use in enabling/disabling UI

Studio: applying action Sass placeholder to publish/create-draft Unit view actions

STUD-1497
2014-04-16 14:44:30 -04:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions.
JIRA: FOR-429
2014-04-10 15:44:30 -04:00
Frances Botsford
df0973e771 addressing review feedback 2014-04-09 16:45:22 -04:00
Andy Armstrong
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04:00
Frances Botsford
ee42902ee6 removed edit-dialog and uploads css, changed component edit icon to pencil, small css fixes 2014-04-09 10:32:11 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
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
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
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
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
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
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
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
Frances Botsford
b59d7ba9ec first stab at publishing status for the container page 2014-03-12 19:33:52 +00: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
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -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
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
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
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
Carson Gee
f02c074db9 Push To LMS updates
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
2014-02-13 10:21:18 -05:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor
UX-381
2014-02-11 15:20:00 -05:00
polesye
faa97379b7 BLD-658: Add view for field type Dict in Studio. 2014-02-11 14:53:57 +02:00
marcotuts
70f064e532 Merge pull request #2468 from edx/marco/studio/fix/component-header-styling
Added back in component header visual separation from component renderin...
2014-02-05 17:47:35 -05:00
marco
799095fd7b updated csscomb ordering for css properties, moving border above padding. 2014-02-05 17:04:00 -05:00