Commit Graph

320 Commits

Author SHA1 Message Date
cahrens
0953583d38 Change code editor icon to say HTML. 2014-03-24 09:44:00 -04:00
Frances Botsford
ed51a664f4 replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar 2014-03-24 09:42:12 -04:00
cahrens
8f6980b212 Use compressed CodeMirror file. 2014-03-21 16:41:42 -04:00
cahrens
a6b18dea80 Fire events before and after the link dialog is shown.
This allows us to convert the static links.
2014-03-21 15:39:44 -04:00
cahrens
bb0a58abf7 Code review feedback. 2014-03-21 15:00:31 -04:00
cahrens
b0c35982a6 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).
2014-03-21 14:49:12 -04:00
cahrens
d3828f929e Fire events before and after the image dialog is shown.
We use this to rewrite links.
2014-03-21 14:49:11 -04:00
cahrens
677f39dd09 Change the name of the button to "Edit HTML".
Changed menu name for consistency, but we don't show it.
2014-03-21 14:42:00 -04:00
cahrens
e1908b5ab2 Fire an event with the link plugin closes so we can rewrite links. 2014-03-21 14:41:59 -04:00
cahrens
d73f65c3a8 Make sure to strip out temporary caret.
It can get left behind in style blocks.
2014-03-21 14:41:58 -04:00
Frances Botsford
7ac1e7bb75 reordered the tinymce buttons 2014-03-21 14:41:58 -04:00
Frances Botsford
b1b0d16a70 made the codemirror look more studio-like 2014-03-21 14:41:58 -04:00
cahrens
9ac94fc4ac Fire events when CodeMirror Editor is open and closed.
Needed to switch static links back and forth.
2014-03-21 14:41:57 -04:00
cahrens
f6acab9d9e Modify paths for location of CodeMirror files. 2014-03-21 14:41:57 -04:00
cahrens
a14574ecad Version 1.3 of CodeMirror plugin. 2014-03-21 14:41:57 -04:00
cahrens
1ece49c346 Delete old Studio skin. 2014-03-21 14:41:57 -04:00
Frances Botsford
9bc0638f23 adding new studio skin for TinyMCE4 2014-03-21 14:41:56 -04:00
Abdallah
1c644fcf2c deleted old tinymce 2014-03-21 14:41:56 -04:00
Dave St.Germain
376b040775 Removed circuit editor setup code that had always been in
codemirror-compressed.js
2014-03-20 14:33:32 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds
a page level javascript SR object to enable reading of alert messages.
LMS-2158
2014-03-20 09:53:44 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling.
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
2014-03-17 10:35:53 -04:00
Dave St.Germain
da72cd355d Fixes STUD-1434 by including the CodeMirror css mode in
codemirror-compressed.js
2014-03-13 10:12:25 -04:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -04: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
daniel cebrian
1a62379a43 fixed conflict between Annotator and internationalitation 2014-02-06 16:31:02 +01:00
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
Greg Price
a83e2c7068 Modify jquery.timeago to better support i18n
Use string interpolation instead of concatenation of prefix, content,
and suffix. This is motivated by the fact that Transifex does not accept
empty strings for translation (even when pgettext is used to provide
context).
2014-01-22 17:58:59 -05:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago
Also get rid of an unused template and extra copies of jquery.timeago.
2014-01-15 16:46:38 -05:00
Greg Price
a8e3bca8c8 Internationalize forums CoffeeScript code 2014-01-14 13:04:51 -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
louyihua
31cb9bab26 The function tzAbbr() causes null-reference exception when the browse returns a non-English timezone string. 2013-12-31 09:12:30 -05:00
zubiar-arbi
5ad73f0839 fix tinymce popup size too small
STUD-674
2013-12-31 14:11:34 +05:00
zubiar-arbi
0d1a10659c update rewriteStaticLinks utility function(modifiy only relative urls)
STUD-674
2013-12-31 12:58:48 +05:00
Adam Palay
e7f029f615 a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) 2013-12-30 16:11:20 -05:00
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
Valera Rozuvan
1542a74d2b Removed logme module. Using console.log() instead.
Removing "logme" from comments.

BLD-608
2013-12-20 16:25:44 +02:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
David Baumgold
6af8ecef03 mitx_markdown => edx_markdown 2013-12-04 10:23:47 -05:00
Valera Rozuvan
f0bbd34ad6 Merge pull request #1715 from robertjmarks/master
changes to allow multiple choicetextresponses in one problem

@adampalay will do!
2013-11-20 21:39:21 -08:00
David Baumgold
e4817f5b4e Removed Backbone sourcemap comment
Because the resulting 404 was causing confusion
2013-11-20 15:55:31 -05:00
RobertMarks
e3b8ce708f changes to allow multiple choicetextresponses in one problem 2013-11-19 09:55:35 -08:00
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run
Fixes BLD-472
2013-11-05 10:22:01 -05:00
cahrens
c7c0aacb00 Add css mode to the compressed file.
STUD-833
2013-10-25 15:33:31 -04:00
Diana Huang
67da62f83c Update the JS to match the new semantics.
Bug: LMS-1311
2013-10-24 17:12:40 -04:00
Diana Huang
43bdb5da54 Minor fixes to match new HTML and CSS updates.
LMS-1311
2013-10-24 17:12:20 -04:00
Diana Huang
20b9258d43 Add in tabIndex to ensure that the tabbing works properly for link.
LMS-1311
2013-10-24 17:10:33 -04:00
Diana Huang
d34c4a66c7 Add skip links to both CMS and LMS
* add HTML for links
* hide links when they are not focused
* when focused, show link (as recommended)
* move accessibility tools to common

LMS-1311
2013-10-24 17:10:33 -04:00
polesye
9dd6c56f9f Add isoTime js view. 2013-10-23 13:00:36 +03:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00