Commit Graph

51 Commits

Author SHA1 Message Date
E. Kolpakov
dcc82e1abe Added default font to a list of available fonts in text editor XModule
Added acceptance test scenario to test for existense of "Default" font and all tinyMCE built-in fonts
Updated AUTHORS
2014-10-01 12:52:38 +04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In
- adding comments

 - spacing issues and indentation
2014-08-06 14:49:40 -04:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
2014-08-05 15:05:56 -04:00
lduarte1991
98446d1c6d Annotation Tools: Code clean-up, formatting, spacing 2014-07-31 14:48:25 -04:00
lduarte1991
9751244e2e Annotation Tools: Fixed Share button to allow selection of text box 2014-07-31 14:48:25 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files
- UI Fixes for Diacritic Mark Plugin
2014-06-02 10:45:29 -04:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails
Changes requested in PR
2014-05-23 14:59:31 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors
Small plugin fixes
2014-05-23 14:57:16 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer"
This reverts commit b0a7443570.
2014-04-08 12:59:04 -04:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader
Accessible PDF textbook viewer
2014-04-07 10:32:28 -04:00
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
2014-04-02 11:12:34 -04:00
cahrens
b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). 2014-04-02 11:12:34 -04:00
Brian Talbot
6443486dd0 scoping TinyMCE editing CSS to just tinyMCE context-based elements 2014-04-02 11:12:33 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04: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
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
Frances Botsford
1e06fd3302 fixed tinymce visual editor css 2014-03-21 14:41:57 -04:00
Dave St.Germain
b0a7443570 updated pdf viewer 2014-03-20 17:00:41 -04:00
lduarte1991
e52e544fb6 As per request #2898, changed the css for annotator tool to affect tinymc only when in annotator-wrapper.
Also removed the outline:none for accessibility requirements and
removed two redundant css files from lms.
2014-03-12 17:09:20 -04: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
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
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
zubiar-arbi
288a699f37 Hide staticpages preview on render
STUD-1071
2013-12-27 15:11:04 +05: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
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
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
Brian Talbot
b7594142fc Studio: adds in specific older IE support area into Sass/CSS architecture 2013-10-26 21:26:53 -04:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
Brian Talbot
5de21ae541 adds/relocates shared vendor css (and assets) to static directories 2013-10-16 16:45:32 -04:00
Brian Talbot
7362e267d7 xmodule - Capa/HTML: adds in standard text-justification class names authors can use within table cells 2013-09-20 11:10:56 -04:00
Kevin Luo
3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) 2013-08-29 12:40:32 -04:00
Miles Steele
5d4a5fcdb0 add slickgrid assets 2013-08-02 09:52:12 -04:00
Frances Botsford
b1653f0561 layout cleanup on LMS PDF Textbook viewer 2013-07-11 11:19:39 -04:00
Julian Arni
bc25defd10 Merge branch 'master' into feature/jkarni/jsinput
Conflicts:
	doc/public/index.rst
2013-06-24 10:46:19 -04:00
Julian Arni
e08215e62a JSinput input type 2013-06-19 17:42:55 -04:00
marco
79c78cbccd made firefox input number increment objects positioned as % to respond to page size accordingly 2013-05-20 15:22:21 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -04:00
marco
32f7691040 minor style changes for increment and decrement buttons on firefox number fields 2013-05-20 11:39:13 -04:00
marco
aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons 2013-05-20 09:45:33 -04:00
marco
47a4d6b6a1 initial polyfill implementation and metadata number entry javascript validation 2013-05-14 23:55:34 -04:00
Brian Wilson
310073ddef use same images for prev/next as used in image-based textbooks 2013-02-26 16:43:48 -05:00
Brian Wilson
8076c5b731 remove unneeded files (that break collectstatic) 2013-02-21 17:38:00 -05:00
Brian Wilson
d5e34b0a44 fix initialization of scale dropdown, and check for valid values of page number 2013-02-21 15:35:03 -05:00
Brian Wilson
00e31c0116 fix toolbarViewer styling 2013-02-21 10:30:20 -05:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -05:00
Brian Wilson
c234f3625e add full version of pdf.js, and main files for jquery-pdfdoc 2013-02-19 18:05:36 -05:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00