• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

  1. … 1 more file in changeset.
LDEV-2524 Implementing the compulsory question option - adding error message on screen if question not answered.

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.

  1. … 1095 more files in changeset.
LDEV-2459 use double quotes when enclosing i18n text in javascript

  1. … 47 more files in changeset.
LDEV-2459 use double quotes when enclosing i18n text in javascript

LDEV-2152: Changes to make it work with IE6

LDEV-2152: Changes to make it work with IE6

LDEV-2152: Changes to make it work with IE6

LDEV-2152: Changes to make it work with IE6

LDEV-2152: Changes to make it work with IE6

  1. … 6 more files in changeset.
LDEV-2152: Changes to make it work with IE6

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

  1. … 213 more files in changeset.
LDEV-2253 Giving the option in qa for rich text editor in learner

  1. … 12 more files in changeset.
LDEV-2152: includes next activity icon

  1. … 28 more files in changeset.
LDEV-1772 display javascript warning when a question is not answered

  1. … 2 more files in changeset.
LDEV-1673: showing a message to students when activity is set to lock when finished

LDEV-1674: shows the questions for the other learners as well

LDEV=1673: Better display of warning for lock when finished

LDEV-1515: Updating the test harness to work with 2.1. Includes getting it working with the tools that now use javascript for submission - which required some tweaking in the tools to default the method to the method needed for the test harness.

  1. … 1 more file in changeset.
LDEV-1206: Run offline now displays the activity title at the top

  1. … 2 more files in changeset.
LDEV-1138: Moved the Redo Questions button so that it is below the user's answers and above the other users answers - just looks better.

LDEV-1138: Added the "Edit" button for reflection, and moved the existing Edit button to above the Reflection

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

  1. … 167 more files in changeset.
LDEV-1248: Answers hidden in monitor were still showing in learner. Updated the export portfolio jsp so that it indicates hidden in the class view, and hides other students' answers that are marked as hidden in the learner view. In the same way, the two learner summary screens now only show a "hidden" response if it is the learner's own response.

  1. … 2 more files in changeset.
Merging 2.0.1 changes from the HEAD

  1. … 244 more files in changeset.
LDEV-1097: Fixing up the behaviour of the learner progress screen, and other bugs found while testing the learner progress changes.

  1. … 6 more files in changeset.
Change textarea to lams:textarea.

Disabled finish button after first click to prevent double click.

Disabled finish button after first click to prevent double click.

reverted escapeXML changes