Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
CNG-1: Further support of LAMS sequences in MindTap. Add notifyCloseURL parameter support in Learning. Add templates and single activity LDs. Copy templates before editing or choosing. Go straight to Tool author/learner for single activity LDs.

  1. … 6 more files in changeset.
LDEV-2702 moving css properties from TabName.tag to .css files

merge from lams2_3_release

  1. … 34 more files in changeset.
LDEV-2664 LearnerFlashEnabled.tag has been reimplemented as Java class (this is done in order to prevent updating list of mobile devices in all modules )

*merged from lams2_3_release

    • -53
    • +0
    ./WEB-INF/tags/LearnerFlashEnabled.tag
  1. … 59 more files in changeset.
LDEV-2664 fix for mobile devices list

    • -1
    • +1
    ./WEB-INF/tags/LearnerFlashEnabled.tag
  1. … 1 more file in changeset.
    • -1
    • +1
    ./WEB-INF/tags/LearnerFlashEnabled.tag
  1. … 1 more file in changeset.
LDEV-2664 check for mobile devices in LearnerFlashEnabled.tag

    • -1
    • +9
    ./WEB-INF/tags/LearnerFlashEnabled.tag
  1. … 3 more files in changeset.
LDEV-2670: LAMS doesn't redirect when using https

LDEV-2628 * Added a callback to lessonComplete.jsp

*merge from lams2_3_release

  1. … 1 more file in changeset.
LDEV-2639 Made print button in LAMS learner optional

*merge from lams2_3_release

  1. … 2 more files in changeset.
LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

  1. … 27 more files in changeset.
LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

  1. … 27 more files in changeset.
LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

  1. … 26 more files in changeset.
LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

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

    • -109
    • +109
    ./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. … 7 more files in changeset.
LDEV-2507 Merge changes to head. New IM pop-up from Monitor.

  1. … 3 more files in changeset.
LDEV-2530 Changed lesson completion page (added completion date)

*merge from lams2_3_release

  1. … 3 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-2530 Changed lesson completion page

  1. … 3 more files in changeset.
LDEV-2479: fix issue with ie8 in preview -planner

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

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

  1. … 50 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)

    • -92
    • +92
    ./WEB-INF/tags/AuthoringButton.tag
  1. … 165 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 18 more files in changeset.