Commit Graph

1407 Commits

Author SHA1 Message Date
Abdallah
35be2e3032 line fix 2014-04-02 16:40:55 +03:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03: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
Andy Armstrong
2086d09ff5 Merge pull request #3121 from louyihua/translation-fix-cms
Translation fix in studio: For better translation in unit.html
2014-03-31 15:37:57 -04:00
louyihua
582971755a Translation fix in studio: For better translation
As the sentence in unit.html is splitted into three parts due to the varible release_date may be None, it breaks the integrity of a sentence.
Different language may have different word or event grammer order, so if a sentence is breaked into three parts, translators cannot adjust the word orders to create a good translation.
So this fix tries to combine the sentence together.
2014-04-01 02:23:02 +08: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
Mark Hoeber
bb4f30b31a Added note about pages being publicly viewable
STUD-1488
2014-03-31 11:14:39 -04: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
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02: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
David Baumgold
274224bf6c Merge pull request #3051 from louyihua/fix-cms-email-translation
Fix typo in studio's email text
2014-03-25 10:40:13 -04:00
louyihua
b70b232205 i18n: Fix typo in studio's email
The right parenthesis should be appeared before the method '.format', not after.
2014-03-25 16:51:24 +08: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
cahrens
9ec3a2da23 Remove CodeMirror tabbed editor. 2014-03-21 14:41:57 -04:00
Abdallah
dda5866180 new tinymce
js changes to support new tinymce
scss changes for alignments
2014-03-21 14:41:56 -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
d685baf478 added loading pattern to studio 2014-03-18 17:11:51 -04:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
cahrens
5166461c62 Don't translate reference code. 2014-03-13 11:58:26 -04:00
cahrens
496a6b8be6 Improve text referencing link for translators. 2014-03-13 11:58:08 -04:00
Frances Botsford
089a1db677 adjusted Studio container publishing status message 2014-03-12 16:56:54 -04:00
Andy Armstrong
3bb4be7d95 Add publishing sidebar to container page 2014-03-12 19:33:52 +00:00
Frances Botsford
b59d7ba9ec first stab at publishing status for the container page 2014-03-12 19:33:52 +00:00
cahrens
653df428f1 Improve code clarity. 2014-03-05 12:59:09 -05:00
cahrens
efe3833a30 Use display_name_with_default instead of display_name. 2014-03-05 12:01:24 -05:00
cahrens
0dbabc7ad8 Support xblocks with children on the container page.
STUD-1363
2014-03-04 17:11:01 -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
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
Mark Hoeber
3553fa7c50 removed dup'd paragraph 2014-02-25 14:42:21 -05:00
Mark Hoeber
46bda852d6 Assets Page Template Update
For embed vs. external URLs

STUD-1338
2014-02-25 14:26:50 -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
Jay Zoldak
4c21270f2e Merge branch 'release' 2014-02-20 16:29:06 -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
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -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
989a97963c Merge pull request #718 from edx/feature/ichuang/push-to-lms
Let a Studio user export course to git (and via git, to elsewhere, eg LMS)
2014-02-13 20:22:31 -05:00
Dave St.Germain
c7c807f270 Merge pull request #2426 from edx/dcs/a11y-labels
Add labels to CAPA inputtypes.
LMS-1895
2014-02-13 13:19:31 -05:00
Dave St.Germain
4fa1f1163e Added labels to CAPA input types, with markdown syntax for adding them
in studio.
LMS-1895 and others
2014-02-13 13:18:24 -05:00