• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

Committed last changed from HEAD to 2.3 branch

    • -15
    • +4
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 99 more files in changeset.
LDEV-2254

Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

    • -15
    • +4
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 162 more files in changeset.
paint plugin and modified lams connector

  1. … 3 more files in changeset.
LDEV-2208 Prettying up gradebook css

LDEV-2220 gradebook changes suggested by james

  1. … 5 more files in changeset.
LDEV-2243: Added support for chrome and safari4

  1. … 1 more file in changeset.
LDEV-2230: update browser detect to support ie8

LDEV-2230: update browser detect to support ie8

Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

    • -2
    • +1
    ./jquery-ui/themes/cupertino/ui.tabs.css
    • -43
    • +46
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 240 more files in changeset.
LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated

- export portfolio fixed

- export fck recordings fixed

- conditions added

- preview images are now produced and displayed

- more feedback for rating

- instructions highlighted

- clicking delete button does not trigger viewing of recording

- timer display corrected

- prompt validation

- misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -2
    • +1
    ./jquery-ui/themes/cupertino/ui.tabs.css
    • -43
    • +46
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 54 more files in changeset.