lams_tool_laqa

  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 27 more files in changeset.
LDEV-2598: Updating Maori

  1. … 7 more files in changeset.
LDEV-2598: Greek, English, Spanish (ES), Spanish (MX) , Maori, Norwegian

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

  1. … 28 more files in changeset.
LDEV-2579 saving conditionList when editing activity in monitor

*merge from HEAD

LDEV-2579 saving conditionList when editing activity in monitor

LDEV-2524 fixed jsps from HEAD branch

*it also includes fix for expanding window on adding new questions.

which is caused by CKEditor and this fix should be removed once CKeditor will start working correct

Merging changes from 2.3 release branch for LDEV-2524.

  1. … 15 more files in changeset.
Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

LDEV-2524 Implementing the compulsory question option.

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2524 Implementing the compulsory question option. Make the question object more complex so we don't have a new map for every field added, and ensure all the necessary data is set up when we redisplay a screen with the error message.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2581 Make sure the rich text field setting is honoured for more than just the first screen!

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2524 Implementing the compulsory question option. Add a new required field, and removed the optional field that had never been implemented properly.

LDEV-2524 Implementing the compulsory question option. Removed excess debugging to make debug level run faster.

LDEV-2524, LDEV-2578 and LDEV-2581. Needed new database field for LDEV-2524

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2524 Implementing the compulsory question option.

file updateTo20101022.sql was initially added on branch lams2_3_release.

    • -0
    • +0
    ./db/sql/updatescripts/updateTo20101022.sql
LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

    • -2
    • +6
    ./web/learning/CombinedAnswersContent.jsp
LDEV-2524 Implementing the compulsory question option - adding error message on screen if question not answered.

LDEV-2524 Implementing the compulsory question option - adding the checkbox.

    • -0
    • +12
    ./web/monitoring/editQuestionBox.jsp
    • -0
    • +12
    ./web/monitoring/newQuestionBox.jsp
LDEV-2524 Implementing the compulsory question option.

LDEV-2568 Q&A export portfolio to include teacher's comments

*merge from lams2_3_release

    • -12
    • +15
    ./web/export/exportportfolio.jsp
LDEV-2568 Q&A export portfolio to include teacher's comments

    • -12
    • +15
    ./web/export/exportportfolio.jsp
LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

  1. … 36 more files in changeset.
LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

  1. … 25 more files in changeset.
LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

  1. … 27 more files in changeset.
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.

    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -6
    • +6
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -4
    • +3
    ./web/learning/CombinedAnswersContent.jsp
  1. … 1082 more files in changeset.