Commit Graph

1630 Commits

Author SHA1 Message Date
Greg Price
285d3579bb Fix unread comment count tooltip rendering
JIRA: FOR-434
2014-01-31 13:30:39 -05:00
jsa
9b54abe308 add "Add A Response" button to thread views in discussion tab / inline
JIRA: FOR-373
2014-01-28 17:13:16 -05:00
Christina Roberts
0c7e203624 Merge pull request #2333 from lduarte1991/master
Updating Annotator CSS
2014-01-27 14:15:46 -08:00
lduarte1991
d214cb8778 Updating Annotator CSS
The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.
2014-01-27 17:12:13 -05:00
Giulio Gratta
65c76cd6a7 Added help text to tooltips and sr flag spans 2014-01-27 13:27:24 -08: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
jsa
168445f7c8 i18n: extract strings from underscore templates
JIRA: FOR-400
2014-01-22 11:07:35 -05:00
Greg Price
e634586882 Merge pull request #2222 from edx/gprice/forum-new-post-buttons
Fix forum buttons
2014-01-22 08:04:35 -08:00
Greg Price
60fb3cfbb2 Make forum New Post buttons behave as buttons
JIRA: FOR-205
2014-01-17 16:38:51 -05:00
Greg Price
2014d34c8a Fix forum button keyboard activation
Previously, buttons were activated on pressing Enter, but the expected
behavior is to activate on pressing Space. Several JavaScript errors
that prevented various buttons from properly activating via the keyboard
are also fixed.
2014-01-17 16:38:51 -05:00
jsa
22d6c6806b expand forums' search text input whenever the field receives focus.
JIRA: FOR-203
2014-01-17 14:13:40 -05:00
Greg Price
f8732a8b3d Internationalize the forums post Markdown editor
This includes removing the "PREVIEW" label for the preview pane from CSS
and adding it to the generated DOM.
2014-01-16 14:10:51 -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
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00
Greg Price
5147a41b07 Merge pull request #2034 from carsongee/cg/notification_prefs_missing_slash
Added missing slash to avoid 302 when calling /notification_prefs/status
2014-01-09 13:01:29 -08:00
Greg Price
b7d7751dc2 Improve accessibility of forum vote buttons
This change involves substantial refactoring of the relevant code to
reduce duplication. It also makes the templates for the vote buttons
more consistent and cleaner.

JIRA: FOR-64
2014-01-06 17:08:53 -05:00
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
2014-01-06 17:02:31 -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
zubair-arbi
236c50d78a Merge pull request #2048 from zubair-arbi/zub/bugfix/std1071-staticpagespreview
Hide staticpages preview on render
2013-12-31 02:02:18 -08: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
zubiar-arbi
288a699f37 Hide staticpages preview on render
STUD-1071
2013-12-27 15:11:04 +05:00
Carson Gee
2796af4abc Added missing slash to avoid 302 when calling /notification_prefs/status 2013-12-23 15:43:00 -05:00
Brian Talbot
2d8a80bd78 Merge pull request #2019 from edx/talbs/tinymce-fonts
TinyMCE: Updating Google Font Syntax
2013-12-21 07:50:54 -08:00
Brian Talbot
06745e1ce9 revising tinymce font import syntax
* matches syntax used when importing Open Sans in LMS/Studio
* simplifies and moves syntax to modern Google Web Font standards
* maintains the http/https agnostic work
2013-12-20 14:15:11 -05:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests
Add acceptance tests of Annotatable module
2013-12-20 11:00:41 -08: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
Calen Pennington
c684a66ac3 Add information to xblocks about when they complete initialization that's visible in javascript 2013-12-17 13:18:22 -05:00
frances botsford
8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup
FED Cleanup of Studio Outline page
2013-12-17 07:27:14 -08:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
David Baumgold
179a1dd44e Revert "Merge pull request #1889 from tusbar/studio-https-fonts"
This reverts commit 540256b213, reversing
changes made to bd04ab5a08.
2013-12-16 09:30:42 -05:00
David Baumgold
540256b213 Merge pull request #1889 from tusbar/studio-https-fonts
Remove protocol from font URLs in Studio and Tiny MCE
2013-12-13 11:52:07 -08:00
Calen Pennington
80fd12b9aa Merge pull request #1692 from cpennington/pure-xblock-handler-urls
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
2013-12-10 10:54:55 -08:00
Calen Pennington
d937da8d47 Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
[LMS-1613]
2013-12-10 12:04:18 -05:00
Frances Botsford
a2d5500f9e FED clean up of studio outline page 2013-12-09 15:21:57 -05:00
Bertrand Marron
42040fb18c Remove protocol in Tiny MCE’s font URLs
Allow the fonts to be served using the same protocol as the current
page.
2013-12-09 21:20:41 +01:00
Greg Price
cec58f885b Remove forum user profile moderator toggle button
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05:00
David Baumgold
6af8ecef03 mitx_markdown => edx_markdown 2013-12-04 10:23:47 -05:00
Greg Price
81798dd8be Improve accessibility of inline discussions
The show/hide toggle now properly acts like a button, and focus is now
trapped on the loading element for both the show/hide action and loading
of a new page.
2013-11-26 14:12:34 -05:00
Greg Price
a0fa9d0b14 Refactor keypress activation for forum buttons
This removes the use of the space key to activate buttons, which is not
expected behavior.
2013-11-26 14:12:34 -05:00
Greg Price
7e074f1a7e Add error recovery to inline discussion loading
Now the interface will reset apropriately and allow a user to retry
expanding the discussion or loading a new page, and the alert message
will ask the user to retry.

JIRA: FOR-300, FOR-301
2013-11-22 11:00:10 -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