Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

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

    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -129
    • +0
    ./WEB-INF/tlds/fckeditor/FCKeditor.tld
  1. … 1089 more files in changeset.
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-2494 fixed Delete file action

    • -13
    • +6
    ./includes/javascript/rsrcresourceitem.js
LDEV-2482 change callback to post so utf8 doesn't mess up

    • -2
    • +2
    ./includes/javascript/rsrcresourceitem.js
LDEV-2152: Changes to make it work with IE6

  1. … 8 more files in changeset.
LDEV-2421 Ability for teacher to sort resource items - author part done

    • -2
    • +130
    ./pages/authoring/parts/itemlist.jsp
  1. … 10 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. … 93 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
    • +1
    ./pages/authoring/parts/instructions.jsp
    • -5
    • +14
    ./pages/itemreview/instructionsnav.jsp
  1. … 162 more files in changeset.
LDEV-2186 Fixed->Adding instructions,deleting instructions, rearranging instructions and showing/hiding the loading icon when instructions are added/removed

    • -42
    • +20
    ./includes/javascript/rsrcresourceitem.js
    • -1
    • +1
    ./pages/authoring/parts/instructions.jsp
  1. … 1 more file in changeset.
LDEV-2186 Arrow buttons to change order of instructions now working again

    • -3
    • +3
    ./includes/javascript/rsrcresourceitem.js
LDEV-2168 Share Resources can now upload files/add urls etc once again

    • -3
    • +5
    ./includes/javascript/rsrcresourceitem.js
  1. … 1 more file 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.

  1. … 17 more files in changeset.
LDEV-1998:Added Instructions field to Vote and Share Resources tools.

  1. … 5 more files in changeset.
LDEV-2152: adds new icon to next activity button

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

  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-2131 Using ajax call to servlet to complete item's (from popup), return javascript to refresh main frame (share resources) and just close window if tool session for the user is finished (ie user moved to next activity).

    • -14
    • +49
    ./pages/itemreview/instructionsnav.jsp
  1. … 3 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

LDEV-2111: Missing tld

    • -199
    • +113
    ./WEB-INF/tlds/fckeditor/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.

  1. … 20 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. … 45 more files in changeset.
LDEV-1998: Added support for Share Resources tool.

    • -0
    • +82
    ./pages/authoring/pedagogicalPlannerForm.jsp
  1. … 10 more files in changeset.
LDEV-2000 - Share resources cuts off buttons when you try to upload but dont put a title

This was simply an issue with the href class=button. The frame was resizing accordingly, but the bottom half of the href button doesnt count in the iframe size, so it was getting cut off. Adding an extra <br /> to the end fixed the problem

    • -1
    • +1
    ./pages/authoring/parts/addlearningobject.jsp
    • -1
    • +1
    ./pages/authoring/parts/addwebsite.jsp
LDEV-1916 adding autopatch to tools, including db_version_insert.sql script to tool deployer

  1. … 71 more files in changeset.