Activity lams/lams_tool

Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex.

Move Editing Advice content from Online Instructions in activities to the metadata table.

Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely).

While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design.

Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

- -1
- +1
./authoring/pedagogicalPlannerForm.jsp
- History
- Source
- Diff
./authoring/pedagogicalPlannerForm.jsp
… 25 more files in changeset.

Friday 11 Feb 2011

12:05 am

Andrey Balan

More
MAIN:andreyb:20110210230545
changed 17 files
MAIN

LDEV-1730 If Tool is not group do now show the group reference

- -5
- +8
./monitoring/parts/statisticpart.jsp
- History
- Source
- Diff
./monitoring/parts/statisticpart.jsp
- -8
- +11
./monitoring/parts/summary.jsp
- History
- Source
- Diff
./monitoring/parts/summary.jsp
… 15 more files in changeset.

Sunday 12 Dec 2010

3: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.

Sunday 05 Dec 2010

9:48 pm

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.

Tuesday 23 Nov 2010

7:34 pm

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.

Monday 22 Nov 2010

8:11 am

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.

Wednesday 17 Nov 2010

11:19 pm

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.

Thursday 04 Nov 2010

9:22 pm

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.

Sunday 24 Oct 2010

3: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.

Thursday 21 Oct 2010

8:50 pm

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

1: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

12: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
- -62
- +57
./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
- -54
- +0
./WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
./WEB-INF/tags/FCKEditor.tag
- -2
- +2
./authoring/basic.jsp
- History
- Source
- Diff
./authoring/basic.jsp
- -1
- +0
./authoring/definelater.jsp
- History
- Source
- Diff
./authoring/definelater.jsp
- -6
- +6
./authoring/pedagogicalPlannerForm.jsp
- History
- Source
- Diff
./authoring/pedagogicalPlannerForm.jsp
- -1
- +1
./common/taglibs.jsp
- History
- Source
- Diff
./common/taglibs.jsp
- -2
- +2
./monitoring/mark/updatemark.jsp
- History
- Source
- Diff
./monitoring/mark/updatemark.jsp
… 1087 more files in changeset.

Thursday 18 Mar 2010

1: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.

1:13 pm

Andrey Balan

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.

Monday 16 Nov 2009

3:25 am

jliew

LDEV-2459 LDEV-2462 surround i18n messages with double quotes when outputting to html or javascript

- -1
- +1
./monitoring/mark/updatemark.jsp
- History
- Source
- Diff
./monitoring/mark/updatemark.jsp
… 45 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)

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

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

jliew