• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2614: Finding items to hide using common class, rather than id.

LDEV-2614: Added a button to collapse an activity and hyperlink to expand it.

  1. … 2 more files in changeset.
LDEV-2577: Readded movieplayer plugin for CKEditor 3.x

  1. … 9 more files in changeset.
LDEV-2577: Readded Paint plugin.

  1. … 6 more files in changeset.
LDEV-2577: Added a new version of equation plugin. This version requires a connection to the plugin's home page.

  1. … 3 more files in changeset.
LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

  1. … 28 more files in changeset.
LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

  1. … 36 more files in changeset.
LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

  1. … 25 more files in changeset.
CLOUD-57 fixing planner error: losing notifyColseURL's query parameters when open in simple editor then full editor

LDEV-2577: Rewrote WikiLink for new CKEditor.

For Firefox 3.6.10 inserting HTML is not working:

https://bugzilla.mozilla.org/show_bug.cgi?id=596300

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

Maybe future releases of FF will allow to insert any content into editor area.

  1. … 7 more files in changeset.
LDEV-2577: Reverted CKEditor skin back to "office2003".

LDEV-2577

The new CKEditor does not have Java Integration library (yet). We have been

using it to:

a) get the tag library to create our own tag <lams:FCKeditor>

But the new CKEditor uses AJAX to get the contents, so the library is

not needed anymore.

The references to it has been deleted from every tool.

FCKEditor.tag has been rewritten to use the new syntax.

b) get a FCKEditor internal file manager by a Connector from the jar

The new CKEditor does not provide a file manager - the license became

commercial and the whole thing became a separate project, CKFinder.

There were alternatives suggested on the web:

jasfinder - http://sourceforge.net/projects/jasfinder/support

kcfinder - http://kcfinder.sunhater.com/

some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/

but we have already nicely integrated with the old file manager. This page:

http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/

in polish says how to use the file manager from the old FCKEditor.

The steps that have to be done:

- download the new CKEditor

- download the old FCKEditor

- copy the filemanager to ckeditor directory

- in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to:

window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' );

- in the file browser/default/browser.html add in line 80:

document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

    • -0
    • +50
    ./ckconfig_custom.js
    • -0
    • +211
    ./ckcontroller.js
  1. … 1092 more files in changeset.
LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

  1. … 2 more files in changeset.
LDEV-2534 designs saved in planner/opened in "Full Author" are getting saved now in user's personal folder

(merge to lams2_3_release branch)

  1. … 1 more file in changeset.
LDEV-2534 designs saved in planner/opened in "Full Author" are getting saved now in user's personal folder

  1. … 1 more file in changeset.
LDEV-2521 merge from head

LDEV-2521 update authorWin window when switching between author and pedagogical planner

LDEV-2515 Backporting planner to 2.3.x

LDEV-2515 Backporting planner to 2.3.x

  1. … 2 more files in changeset.
merge fix for LDEV-2381 from lams2_3_release branch

LDEV-2381 'add lesson' link not initialised for thickbox when group contents had to be expanded

LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
file thickbox.patched.js was added on branch lams2_3_release on 2010-02-26 21:10:34 +0000

Recreated/updated several resources removed by previous merge.

  1. … 5 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 211 more files in changeset.
Undo-ing some changes to return to 2.3 branch

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

    • -0
    • +342
    ./thickbox.patched.js
  1. … 18 more files in changeset.
LDEV-2259 jquery selector was mixing up id values of lessons and orgIds - ideally selector should be 'div#orgId', but this didn't work, so we pass the element itself directly since we already have it.