Activity lams-github/lams_tool

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner. 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
./web/includes/javascript/jquery.form.js
- History
- Source
- Diff
./web/includes/javascript/jquery.form.js
… 2 more files in changeset.

3:31 pm

Marcin Cieslak

More
faba595
changed 28 files
v4.7, v4.8

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

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

7:33 pm

Andrey Balan

More
77837e4
changed 1 file
v4.7, v4.8

LDEV-2621 fixed "Error on export summary for essay type of questions"

- -1
- +1
./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../action/MonitoringAction.java

9:52 pm

Marcin Cieslak

More
a7ea49b
changed 28 files
v4.7, v4.8

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

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

7:36 pm

Marcin Cieslak

More
1cd46cd
changed 27 files
v4.7, v4.8

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

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

5:03 pm

Andrey Balan

More
6226821
changed 1 file
v4.7, v4.8

LDEV-2504 Answers in HTML format get displayed in export portfolio now

- -0
- +1
./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../action/LearningAction.java

4:49 pm

Andrey Balan

More
01bb625
changed 1 file
v4.7, v4.8

LDEV-2390 fixing "Empty individual report in Assessment tool monitor"

*merge from lams2_3_release

- -6
- +4
./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
- History
- Source
- Diff
./src/java/.../AssessmentServiceImpl.java

8:13 am

Marcin Cieslak

More
5fc841f
changed 28 files
v4.7, v4.8

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

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

11:28 pm

Marcin Cieslak

More
94f0ee9
changed 28 files
v4.7, v4.8

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/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

12:48 pm

Andrey Balan

More
8752a8f
changed 2 files
v4.7, v4.8

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

*merge from lams2_3_release

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

3:38 pm

erniegx <ernieg@gmail.com>

More
bf7cf20
added 1 file
v4.7, v4.8

Adding Maori

- -0
- +246
./conf/language/lams/ApplicationResources_mi_NZ.properties
- History
- Source
./conf/.../ApplicationResources_mi_NZ.properties

9:24 pm

Marcin Cieslak

More
4de7728
changed 29 files
v4.7, v4.8

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

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

3:39 pm

Marcin Cieslak

More
d0c090e
changed 37 files
v4.7, v4.8

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

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

8:57 pm

Marcin Cieslak

More
46d8c21
changed 25 files
v4.7, v4.8

LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

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

5:59 am

erniegx <ernieg@gmail.com>

More
73c9717
changed 1 file
v4.7, v4.8

LDEV-2586 removing HTML tags on export to xls

- -1
- +1
./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../action/MonitoringAction.java

1:48 pm

Marcin Cieslak

More
2857686
changed 28 files
v4.7, v4.8

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

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

12:18 pm

Marcin Cieslak

More
8179037
changed 1097 files
v4.7, v4.8

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.