Commit Graph

3273 Commits

Author SHA1 Message Date
Christina Roberts
269cd19abe Merge pull request #3155 from edx/christina/tinymce-update-cdn2
Upgrade TinyMCE to 4.0.20 and replaced tabbed HTML editor
2014-04-02 13:55:50 -04:00
David Baumgold
092d620185 Merge pull request #3147 from mtyaka/password-reset-email-http
Don't hardcode https protocol in password reset email.
2014-04-02 13:46:45 -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
Matjaz Gregoric
1cb7628d8b Don't hardcode https protocol in password reset email.
Use http or https, depending on the value of `is_secure`.
This is similar to how links in some other email templates work.
2014-04-02 16:46:01 +02: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
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
Sarina Canelake
4b1228be92 Merge pull request #3119 from louyihua/translation-fix
Fix a decode error in course_about.html and make some string translatable
2014-04-01 15:43:10 -04:00
Greg Price
2a1ddab224 Improve inline discussion UI
1. Add space between threads
2. Change Show/Hide to Expand/Collapse and visually separate it
3. Limit a thread to 700px high and scroll if longer

Co-authored-by: marco <marcotuts@gmail.com>
2014-04-01 11:52:54 -04:00
louyihua
3b14ee8a04 Fix a decode error in course_about.html and make some string translatable
The strings in share links should be in unicode, otherwise when the name of a course is non-ascii, it will generate a decode error.
And some of these strings is actually translatable, so they should be collected into mako.po.
2014-04-01 23:49:32 +08:00
David Baumgold
cbfe12fc9c Merge pull request #3088 from fmyzjs/patch-3
Update course_about.html
2014-03-31 13:36:55 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Jason Zhu
a29485960d Update course_about.html
if course title use Chinese or other language got the 500 error when visit the course_about page ,and the log shows :UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-3: ordinal not in range(128)
2014-03-27 23:00:02 +08: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
louyihua
0316f3b758 i18n: make emails in lms translatable
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
2014-03-26 22:33:21 +08:00
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
2014-03-24 16:57:56 -04:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace.
All YouTube urls are defined on backend side.
2014-03-24 18:40:28 +02: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
David Baumgold
e55bca6bf1 Merge pull request #3023 from edx/db/unicode-server-error-page
Unicode strings for server error page
2014-03-24 11:24:02 -04:00
Sarina Canelake
7cf093606c i18n Inst Dash Email tab
LMS-2357
2014-03-21 17:49:13 -04:00
Sarina Canelake
71931bcf0f i18n Inst Dash Membership tab
LMS-2357
2014-03-21 17:49:12 -04:00
David Baumgold
91e120eea0 Unicode strings for server error page 2014-03-21 14:50:55 -04:00
cahrens
ffbba2ba0c Update tinymce paths. 2014-03-21 14:41:59 -04:00
cahrens
6c1d369b71 Remove unused testing templates and unused tabs. 2014-03-21 14:41:59 -04:00
cahrens
0ddc3a6556 Changes to support Bulk e-mail usage. 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
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions
Catch module render exceptions
2014-03-21 21:12:30 +05:00
Valera Rozuvan
55b0fd08e7 Merge pull request #3011 from edx/valera/delete_old_files
Removed unused code that is over 2 years old.
2014-03-21 16:45:26 +02:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment
Simple email checking for batch enrollment on inst dash
2014-03-21 07:45:09 -04:00
Valera Rozuvan
7e9ebb09a0 Removed unused code that is over 2 years old. 2014-03-21 13:29:51 +02:00
Sarina Canelake
066d04f595 Simple email checking for batch enrollment on inst dash
LMS-2244
2014-03-20 15:58:19 -04:00
Dave St.Germain
3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header
Remove course name from page H1, and slightly improve sequence navigation
2014-03-20 14:07: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
jmclaus
f2489d141c Removed tooltip from captions. [BLD-629] 2014-03-20 10:24:27 +01:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module.
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
2014-03-19 19:30:45 +02:00
Usman Khalid
ae73f3eaa0 Puts module.render() in try statements.
LMS-1192
2014-03-19 19:30:22 +05:00
Sarina Canelake
8f24a5fd5e Batch add/remove beta testers on beta dash
LMS-1287
2014-03-18 16:08:59 -04:00
Adam Palay
d7c9491f23 Bulk beta tester add/remove on instructor dashboard
LMS-1287
2014-03-18 16:08:58 -04:00
David Baumgold
6e0a455cd7 Merge pull request #2730 from ionis-education-group/fix-static-urls
Fix URLs for static resources
2014-03-17 17:00:30 -04:00
Dave St.Germain
6813b27b3b Remove coursename from page H1, and slightly improve sequence navigation 2014-03-13 13:49:14 -04:00
Sarina Canelake
7d2f9b88e3 Merge pull request #2857 from edx/adam/new-data-download
Update data download dash for parity (LMS-1203)
2014-03-13 10:58:50 -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
Adam Palay
74714c4ed7 Update data download dash for parity (LMS-1203) 2014-03-13 06:47:40 -04:00
Giulio Gratta
1cd5a80d1e replace unicode 'X' with font-awesome 'remove' 2014-03-11 12:48:58 -07:00
Giulio Gratta
0b3a67d287 focus management and js syntax fix 2014-03-11 11:10:27 -07:00
Giulio Gratta
2ae18c005f change 'modal' wording to something more general and less jargony 2014-03-11 11:05:42 -07:00
frances botsford
28382316aa Merge pull request #2867 from edx/frances/feature/lms-inst-dash-cleanup
cleanup of instructor dash membership
2014-03-11 13:38:36 -04:00
Frances Botsford
fd1014457d cleanup of instructor dash membership 2014-03-11 13:05:30 -04:00
Gabe Mulley
d0b12ee3be Generalize grade report to allow display of any report
We would like to be able to generate arbitrary reports and expose them to the instructor by simply uploading them to S3.  The existing grade download infrastructure pretty much supported that already, however, all of the internal and external structures were referring to the reports as exclusively grading related.

Fixes: AN-590
2014-03-11 10:14:37 -04:00
Sarina Canelake
472d8f5f52 Minor changes to instructor Analytics tab 2014-03-08 08:51:36 -05:00