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.

    • -0
    • +50
    ./ckconfig_custom.js
    • -0
    • +211
    ./ckcontroller.js
  1. … 1092 more files in changeset.
LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

  1. … 2 more files in changeset.
LDEV-2534 designs saved in planner/opened in "Full Author" are getting saved now in user's personal folder (merge to lams2_3_release branch)

  1. … 1 more file in changeset.
LDEV-2521 update authorWin window when switching between author and pedagogical planner

merge fix for LDEV-2381 from lams2_3_release branch

LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
Recreated/updated several resources removed by previous merge.

  1. … 5 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. … 164 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.

    • -0
    • +342
    ./thickbox.patched.js
  1. … 18 more files in changeset.
LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

    • -15
    • +4
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 162 more files in changeset.
LDEV-2230: update browser detect to support ie8

LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated - export portfolio fixed - export fck recordings fixed - conditions added - preview images are now produced and displayed - more feedback for rating - instructions highlighted - clicking delete button does not trigger viewing of recording - timer display corrected - prompt validation - misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -2
    • +1
    ./jquery-ui/themes/cupertino/ui.tabs.css
    • -43
    • +46
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 54 more files in changeset.
LDEV-2175: Added Formulae editor to learner

LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

  1. … 46 more files in changeset.
LDEV-2120 Adding links from index page to gradebook

  1. … 3 more files in changeset.
LDEV-2197 Presence Chat - Added a scrollbar to Presence user listings - Changed css - Scrolling better, still a bit iffy

  1. … 2 more files in changeset.
LDEV-2173 Moving jquery library so jqGrid can keep using 1.2.6 as the new 1.3.2 breaks the search function

    • -0
    • +11
    ./jqgrid/js/jquery-1.2.6.pack.js
  1. … 1 more file in changeset.
- Updated jQuery core to v1.3.2 - Updated jQuery UI to v1.7.1 - Classic Wizard now has checkbox visible to enable Presence Chat - Learner no longer has a Presence box - Presence Chat committed

    • binary
    ./jquery-ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    • binary
    ./jquery-ui/themes/base/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    • binary
    ./jquery-ui/themes/base/images/ui-icons_222222_256x240.png
    • binary
    ./jquery-ui/themes/base/images/ui-icons_2e83ff_256x240.png
    • binary
    ./jquery-ui/themes/base/images/ui-icons_454545_256x240.png
    • binary
    ./jquery-ui/themes/base/images/ui-icons_888888_256x240.png
    • binary
    ./jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png
    • -0
    • +412
    ./jquery-ui/themes/base/jquery-ui.css
  1. … 250 more files in changeset.
Adding source to customized planner fckconfig

LDEV-2173 Adding monitor link for activities in the activity view

    • -3
    • +3
    ./jqgrid/js/min/grid.setcolumns-min.js
  1. … 5 more files in changeset.
Fixing up the jqgrid show/hide column dialog so it looks better and displays only the required text

    • -3
    • +3
    ./jqgrid/js/min/grid.setcolumns-min.js
LDEV-2173 Fixed up some javascript referencing issues with the jqGrid library, Now it will work server-wide for LAMS (it will not work for RAMS unfortunately at this point but this can be fixed by editing the jquery.jqGrid.js file

  1. … 2 more files in changeset.
LDEV-2179: Added "Export sequence" button.

  1. … 6 more files in changeset.
LDEV-2173 - First commit for gradebook stuff

First monitor interface implemented, teachers can look by activity to mark the students work

    • -0
    • +1482
    ./jqgrid/js/grid.base.js
    • -0
    • +441
    ./jqgrid/js/grid.celledit.js
    • -0
    • +303
    ./jqgrid/js/grid.common.js
    • -0
    • +416
    ./jqgrid/js/grid.custom.js
    • -0
    • +957
    ./jqgrid/js/grid.formedit.js
    • -0
    • +189
    ./jqgrid/js/grid.inlinedit.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-bg.js
    • -0
    • +75
    ./jqgrid/js/grid.locale-de.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-en.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-it.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-pl.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-pt-br.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-pt.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-ru.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-sp.js
  1. … 234 more files in changeset.
Added more actions drop down menu for each group header.

LDEV-2167

  1. … 1 more file in changeset.
LDEV-1998: Added full description for nodes containing templates. Changed "Preview" and "Editor" links position. Changed Lucene filter parameters.

  1. … 5 more files in changeset.
LDEV-1998: Added fitler based on Lucene project.

  1. … 13 more files in changeset.
LDEV-1998: Added Scribe tool and Parallel Activities support. Adjusted design for IE.

  1. … 17 more files in changeset.
LDEV-1998: Added preview/export/import functionality for Pedagogical Planner nodes. Fixed some bugs. Added some code comments.

  1. … 23 more files in changeset.