Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -6
    • +6
    ./authoring/pedagogicalPlannerForm.jsp
    • -4
    • +3
    ./learning/SequentialAnswersContent.jsp
  1. … 1082 more files in changeset.
LDEV-2552 MErging changes with head

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-2498 Increased the width for Q&A iframe

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

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

    • -1
    • +3
    ./learning/IndividualLearnerResults.jsp
LDEV-2152: Changes to make it work with IE6

LDEV-2152: Changes to make it work with IE6

    • -1
    • +1
    ./learning/IndividualLearnerResults.jsp
  1. … 6 more files 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. … 92 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)

    • -181
    • +181
    ./authoring/newQuestionBox.jsp
    • -2
    • +11
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +13
    ./learning/SequentialAnswersContent.jsp
  1. … 162 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
LDEV-1998: Added "Clear entry" icon in activities with collections of entries.

    • -13
    • +38
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 17 more files in changeset.
LDEV-2152: includes next activity icon

    • -3
    • +3
    ./learning/IndividualLearnerResults.jsp
  1. … 40 more files in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 more files in changeset.
LDEV-1998: Adjusted layout of tools' PedPlanner form contents.

    • -2
    • +2
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 13 more files in changeset.
LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

  1. … 21 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

  1. … 1 more file in changeset.
LDEV-1998: Made a break between branches/options. When adding multiple questions to Q&A, previous entries are also saved (same in MCQ, Vote and Forum). Added some code comments.

    • -0
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 5 more files in changeset.
LDEV-2111: Missing FCKEditor.tag

  1. … 1 more file in changeset.
LDEV-2111: Missing tld

    • -199
    • +113
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
  1. … 2 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

  1. … 25 more files in changeset.
LDEV-1998: Added FCKeditors for several tools. Adjusted styles for IE.

    • -3
    • +27
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 19 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 21 more files in changeset.
LDEV-1998: Added Editing advice for all tools. Added FCKEditor for Notebook, Chat and Submit Files.

    • -1
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 45 more files in changeset.
LDEV-1998: Committing Pedagogical Planner base files and support for chat, forum, multiple choice, Q&A, noticeboard, notebook and vote tools.

    • -0
    • +48
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 110 more files in changeset.
LDEV-2047 - Cognitive skills wizard causes buttons to get cut off in new questions

Changed the method of resizing the iframe to detect the height of the qa wizard div

Requests from Spyros to change the width of the wizard dialog in the config page,

and to add furhter entries to the qa wizard

  1. … 2 more files in changeset.
Fixed a ifram resizing problem for the qa wizard, the new question ifram needed to be adjusted when the user expanded the qa wizard area

Added some javascript for trhe qa wizard so it resizes the iframe when you expand the wizard area

LDEV-1997 Save after export keeps exporting the file but not saving...

The "dispatch" param was not being reset after an export, so from then on each submit was assumed to be an export action, simple fix