Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

  1. … 28 more files in changeset.
LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

  1. … 36 more files in changeset.
LDEV-2577: Reverted CKEditor skin back to "office2003".

  1. … 3 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.

    • -37
    • +37
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
  1. … 1093 more files in changeset.
LDEV-2556 LDEV-2557 Tooltip style and Workspace dialog /author info changes to HEAD.

  1. … 6 more files in changeset.
LDEV-2507 Merge changes to head. New IM pop-up from Monitor.

  1. … 3 more files in changeset.
LDEV-2484: Learner's tab only shows one student (only one row)

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

  1. … 28 more files in changeset.
LDEV-2471 Merging swf to head

LDEV-2459 use double quotes when enclosing i18n text in javascript

  1. … 47 more files in changeset.
LDEV-2433 Fixing bug causing default user selected in monitors to always be Mary Morgan

Oops, forgot to include the swf file with this

LDEV-2433 Fixed the issue that was stopping the course name from being displayed

  1. … 3 more files in changeset.
LDEV-2413 Sorting sequences alphabetically case-insensitive

  1. … 1 more file in changeset.
LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 96 more files in changeset.
Merge lams2_3 to head (continuing...)

  1. … 49 more files in changeset.
more merging lams2_3 into head

  1. … 31 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. … 167 more files in changeset.
Merge lams2_3 into head

  1. … 124 more files in changeset.
LDEV-2341 Fixed problems with mouse cursor loosing focus, loading icon not appearing properly in monitor

  1. … 2 more files in changeset.
Monitoring now allows IM to be enabled

  1. … 3 more files in changeset.
LDEV-2218 increased widths for opt sequences title, support acts title, and title of activity in PI

  1. … 5 more files in changeset.
LDEV-2244 window sizes changed from 800x600 to 920x700 for preview window and when users double clicks an activity

  1. … 5 more files in changeset.
LDEV-2240 View Time Graph button now only enabled if one or more learners has made enough progress to populate the graphs/charts.

  1. … 5 more files in changeset.
LDEV-1990 Competence editor now support full stops

  1. … 4 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

  1. … 6 more files in changeset.
LDEV-2224 Applied paul's update for ajax loader to wizard and ordered the tree (sequences/folders) alphabetically.

  1. … 3 more files in changeset.
LDEV-2209 Fixed browser different problem, improved timing of opening private folder node.

  1. … 1 more file in changeset.
LDEV-2209 Relying on user's private folder as the first folder under the ROOT dir. Ordering must be correct from first service call. Not enough information otherwise to determine if folder is user's private folder.

  1. … 3 more files in changeset.
LDEV-2209 Forgot to clear hardcoded value.

  1. … 1 more file in changeset.