Commit Graph

295 Commits

Author SHA1 Message Date
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
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03:00
David Baumgold
8906cffb22 correct placement of baseUrl variable, use it to configure requirejs 2013-10-09 11:28:46 -04:00
David Baumgold
e53680bb92 make drag_and_drop component work with requirejs and changed static url 2013-10-09 10:26:22 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation.
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
2013-10-07 17:18:40 -04:00
Peter Fogg
2d3cba06d2 Rework course overview drag and drop.
Failed drags bring the element back to where it started; elements are
locked to the y-axis, states are represented as CSS classes for
styling, elements can be dragged across section/subsection borders,
and dragging to the top/bottom of a section Just Works™.

Needs some styling love to give visual representation of where the
dragged element will drop, though.

TODO: It'd be good to have auto expand/collapse for subsections.
2013-10-07 17:17:46 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Usman Khalid
bc56ab7c13 Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows
Disables the previous/next arrows on pdf books on the first/last pages
2013-09-27 12:50:38 -07:00
Usman Khalid
64d4ebdaa1 Revert last commit 2013-09-28 00:14:07 +05:00
Usman Khalid
59403644ae Moved jquery event handling to parent since hidden elements do not get events attached 2013-09-27 21:35:16 +05:00
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05:00
Usman Khalid
d0f0e59272 Fixed js coding style for pdf arrows toggle 2013-09-25 22:52:51 +05:00
Don Mitchell
f8cd482621 Replace date lib w/ simpler tzAbbr 2013-09-23 16:56:30 -04:00
Usman Khalid
59c5baeb1b Disables the previous/next arrows on pdf books on the first/last pages respectively 2013-09-19 20:50:05 +05:00
Peter Baratta
48cb05c037 Reset 'correctness' visual indicator of a problem on new input
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
2013-08-30 12:03:41 -04:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts.
STUD-669.
2013-08-29 14:35:16 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Julian Arni
b6795b4e88 Add jquery-file-upload 2013-08-25 22:40:09 -04:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Peter Baratta
e312344dfa Fix initial loading bug.
Change the `MathJax.Hub.Queue(initializeRequest)` to a simpler function call
(`initializeRequest.call(this)`). This was failing to give a proper context
to initializeRequest, and `this.value` was turning up as `undefined`.

Also add a fallback if we need to display some code before MathJax finishes
its original typesetting.

I was stubbing out `Queue` in my specs, so the tests had to be changed around
a little.
2013-08-13 13:33:51 -04:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
2013-08-12 11:48:45 -04:00
David Baumgold
82ac56068e Assign isExternal JS function to window object
When JS functions are defined with names, they are local variables, and inaccessible
if defined inside a closure. Django-Pipeline concatenates all of our JS into one
big closure. This function explicitly assings the function to a property of the
`window` object, so that it is accessible to other JS functions.
2013-08-06 16:39:04 -04:00
Miles Steele
5d4a5fcdb0 add slickgrid assets 2013-08-02 09:52:12 -04:00
jmclaus
8c3f4388d6 video_speed_control passes all tests except 1
Mocked loading of captions.
Fixed remaining tests in captions.
Fixed failing tests in speed control, and quality control. Turned off all VideoAlpha tests because browser crashes when all are run at once. To check that they are passing, go through each file one by one, replacing xdescribe with describe. Dont forget to change back to xdescribe when the test was run and turns out to be OK.
Some tests at the end of video_player_spec.js pass
Further fixing tests in video_player_spec file.
transfers changes to test_logic from master to __init__ and other files
Fixing more tests.
2013-08-01 20:08:45 +03:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
RobertMarks
46ae2f9c26 Added support for a new problem type: ChoicetextResponse 2013-07-18 10:12:56 -07:00