Activity lams/lams_tool

The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

- -486
- +645
./includes/javascript/jquery.form.js
- History
- Source
- Diff
./includes/javascript/jquery.form.js
… 2 more files in changeset.

10:29 pm

Marcin Cieslak

More
MAIN:marcin:20101212142934
changed 28 files
MAIN

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

- -7
- +14
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

4:48 am

Marcin Cieslak

More
MAIN:marcin:20101205204832
changed 28 files
MAIN

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

2:34 am

Marcin Cieslak

More
MAIN:marcin:20101123183416
changed 27 files
MAIN

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 26 more files in changeset.

3:11 pm

Marcin Cieslak

More
MAIN:marcin:20101122071147
changed 28 files
MAIN

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

- -0
- +4
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

6:19 am

Marcin Cieslak

More
MAIN:marcin:20101117221915
changed 28 files
MAIN

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

7:48 pm

Andrey Balan

More
MAIN:andreyb:20101115114829
changed 2 files
MAIN

LDEV-2569 fixed problem with 2 ordering question on the same page

*merge from lams2_3_release

- -1
- +3
./pages/learning/learning.jsp
- History
- Source
- Diff
./pages/learning/learning.jsp
- -1
- +1
./pages/learning/parts/ordering.jsp
- History
- Source
- Diff
./pages/learning/parts/ordering.jsp

4:03 am

Andrey Balan

LDEV-2569 fixed problem with 2 ordering question on the same page

- -1
- +2
./pages/learning/learning.jsp
- History
- Source
- Diff
./pages/learning/learning.jsp
- -1
- +2
./pages/learning/parts/ordering.jsp
- History
- Source
- Diff
./pages/learning/parts/ordering.jsp

4:22 am

Marcin Cieslak

More
MAIN:marcin:20101104202233
changed 29 files
MAIN

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

- -17
- +27
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 28 more files in changeset.

9:36 pm

Marcin Cieslak

More
MAIN:marcin:20101024133648
changed 37 files
MAIN

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

- -1
- +2
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 36 more files in changeset.

2:50 am

Marcin Cieslak

More
MAIN:marcin:20101021185055
changed 26 files
MAIN

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 25 more files in changeset.

7:46 pm

Marcin Cieslak

More
MAIN:marcin:20101010114643
changed 28 files
MAIN

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

6:09 pm

Marcin Cieslak

More
MAIN:marcin:20101006100917
changed 1097 files
MAIN

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.

- -8
- +1
./WEB-INF/web.xml
- History
- Source
- Diff
./WEB-INF/web.xml
- -0
- +53
./WEB-INF/tags/CKEditor.tag
- History
- Source
./WEB-INF/tags/CKEditor.tag
- -54
- +0
./WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/FCKEditor.tag
- -129
- +0
./WEB-INF/tlds/fckeditor/FCKeditor.tld
- History
- Source
- Diff
./WEB-INF/tlds/fckeditor/FCKeditor.tld
- -2
- +2
./WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
./WEB-INF/tlds/lams/lams.tld
- -1
- +0
./common/taglibs.jsp
- History
- Source
- Diff
./common/taglibs.jsp
- -3
- +3
./includes/javascript/assessmentoption.js
- History
- Source
- Diff
./includes/javascript/assessmentoption.js
- -2
- +2
./pages/authoring/basic.jsp
- History
- Source
- Diff
./pages/authoring/basic.jsp
- -6
- +6
./pages/authoring/parts/addessay.jsp
- History
- Source
- Diff
./pages/authoring/parts/addessay.jsp
- -7
- +7
./pages/authoring/parts/addmatchingpairs.jsp
- History
- Source
- Diff
./pages/authoring/.../addmatchingpairs.jsp
- -17
- +17
./pages/authoring/parts/addmultiplechoice.jsp
- History
- Source
- Diff
./pages/authoring/.../addmultiplechoice.jsp
- -7
- +7
./pages/authoring/parts/addnumerical.jsp
- History
- Source
- Diff
./pages/authoring/parts/addnumerical.jsp
- -14
- +14
./pages/authoring/parts/addordering.jsp
- History
- Source
- Diff
./pages/authoring/parts/addordering.jsp
- -7
- +7
./pages/authoring/parts/addshortanswer.jsp
- History
- Source
- Diff
./pages/authoring/parts/addshortanswer.jsp
- -12
- +12
./pages/authoring/parts/addtruefalse.jsp
- History
- Source
- Diff
./pages/authoring/parts/addtruefalse.jsp
… 1082 more files in changeset.

8:58 pm

Andrey Balan

More
MAIN:andreyb:20100318125813
changed 29 files
MAIN

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

- -1
- +1
./WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
./WEB-INF/tags/AuthoringButton.tag
… 28 more files in changeset.

web

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Ernie Ghiglione

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan