Activity lams/lams_tool

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	14
Last Commit:
Commits this week:	0
Total Lines of Code (LoC):	18,276
Net change in LoC this week:	0

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Monday 06 Dec 2010

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.

Monday 22 Nov 2010

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.

Thursday 18 Nov 2010

6:44 am

Marcin Cieslak

More
MAIN:marcin:20101117224431
changed 2 files
MAIN

LDEV-2601: An attempt to fix Chrome ignoring CSS width.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag
… 1 more file 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.

Friday 05 Nov 2010

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.

Thursday 28 Oct 2010

2:00 am

Marcin Cieslak

More
MAIN:marcin:20101027180010
changed 1 file
MAIN

LDEV-2595: An attempt to fix overflowing of viewable screen by CKEditor: reduced width of the initial textarea.

- -1
- +1
./WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/CKEditor.tag

Sunday 24 Oct 2010

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.

Friday 22 Oct 2010

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.

Sunday 10 Oct 2010

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.

Wednesday 06 Oct 2010

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.

- -2
- +2
./WEB-INF/lams.tld
- History
- Source
- Diff
./WEB-INF/lams.tld
- -129
- +0
./WEB-INF/fckeditor/tlds/FCKeditor.tld
- History
- Source
- Diff
./WEB-INF/fckeditor/tlds/FCKeditor.tld
- -36
- +36
./WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
./WEB-INF/struts/struts-config.xml
- -0
- +53
./WEB-INF/tags/CKEditor.tag
- History
- Source
./WEB-INF/tags/CKEditor.tag
- -55
- +0
./WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/FCKEditor.tag
- -1
- +1
./common/taglibs.jsp
- History
- Source
- Diff
./common/taglibs.jsp
- -2
- +2
./pages/authoring/basic.jsp
- History
- Source
- Diff
./pages/authoring/basic.jsp
- -6
- +6
./pages/authoring/pedagogicalPlannerForm.jsp
- History
- Source
- Diff
./pages/.../pedagogicalPlannerForm.jsp
- -3
- +3
./pages/learning/notebook.jsp
- History
- Source
- Diff
./pages/learning/notebook.jsp
… 1088 more files in changeset.

Thursday 18 Mar 2010

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.

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

8:13 pm

Andrey Balan

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

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

Monday 14 Sep 2009

3:08 pm

Ernie Ghiglione

More
MAIN:ernieg:20090914070818
changed 11 files
MAIN

LDEV-2152: Changes to make it work with IE6

- -1
- +1
./pages/learning/notebook.jsp
- History
- Source
- Diff
./pages/learning/notebook.jsp
- -1
- +1
./pages/learning/runOffline.jsp
- History
- Source
- Diff
./pages/learning/runOffline.jsp
… 9 more files in changeset.

3:07 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

- -1
- +1
./pages/learning/notebook.jsp
- History
- Source
- Diff
./pages/learning/notebook.jsp
- -1
- +1
./pages/learning/runOffline.jsp
- History
- Source
- Diff
./pages/learning/runOffline.jsp
… 9 more files in changeset.

Friday 24 Jul 2009

2:02 am

Andrey Balan

More
MAIN:andreyb:20090723180255
changed 6 files
MAIN

LDEV-2387 Changed rendering of FCKEditor in Assessment and Notebook tool

* removed commented script part from FCKEditor.tag

* removed all references to fckeditor.js, fckcontroller.js, fckeditor.css

- -23
- +1
./WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/FCKEditor.tag
- binary
./WEB-INF/tags/headItems.tag
- History
- Source
- Diff
./WEB-INF/tags/headItems.tag
- -4
- +0
./common/learnerheader.jsp
- History
- Source
- Diff
./common/learnerheader.jsp
… 3 more files in changeset.

Thursday 02 Jul 2009

4:18 pm

jliew

More
MAIN:jliew:20090702081820
changed 215 files
MAIN

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)

- -2
- +2
./pages/authoring/addCondition.jsp
- History
- Source
- Diff
./pages/authoring/addCondition.jsp
… 214 more files in changeset.

Friday 08 May 2009

6:16 pm

Marcin Cieslak

More
lams2_3:marcin:20090508101612
changed 5 files
lams2_3

LDEV-2326: Buttons in Condition form had argument href="#' which caused the page to reload. It was changed to href="javascript:;".

- -2
- +2
./pages/authoring/addCondition.jsp
- History
- Source
- Diff
./pages/authoring/addCondition.jsp
… 4 more files in changeset.

Tuesday 07 Apr 2009

1:07 am

Marcin Cieslak

More
MAIN:marcin:20090406170713
changed 58 files
MAIN

LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.