lams / lams_learning / web

WEB-INF

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 17
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 15,702
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Sunday 24 Oct 2010
3:36 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./tags/CKEditor.tag
  2. … 36 more files in changeset.
Thursday 21 Oct 2010
8:52 pm

Marcin Cieslak

LDEV-2577: Reverted CKEditor skin back to "office2003".

Options
    • -1
    • +1
    ./tags/CKEditor.tag
  2. … 3 more files in changeset.
Sunday 10 Oct 2010
1:46 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
12:09 pm

Marcin Cieslak

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.

Options
    • -2
    • +2
    ./lams.tld
    • -109
    • +109
    ./struts/struts-config.xml
    • -0
    • +53
    ./tags/CKEditor.tag
    • -54
    • +0
    ./tags/FCKEditor.tag
  5. … 1093 more files in changeset.
Thursday 18 Mar 2010
1:58 pm

Andrey Balan

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

Options
    • binary
    ./tags/AuthoringButton.tag
  2. … 28 more files in changeset.
1:13 pm

Andrey Balan

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

Options
    • binary
    ./tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Tuesday 28 Jul 2009
4:19 pm

Andrey Balan

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

Options
    • -23
    • +0
    ./tags/FCKEditor.tag
    • -6
    • +1
    ./tags/headItems.tag
  3. … 96 more files in changeset.
Friday 03 Jul 2009
6:57 am

jliew

Merge lams2_3 to head (continuing...)

Options
    • -1
    • +5
    ./web.xml
  2. … 50 more files in changeset.
Thursday 02 Jul 2009
10:18 am

jliew

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)

Options
    • binary
    ./tags/AuthoringButton.tag
    • -1
    • +13
    ./tags/ProgressOutput.tag
  3. … 213 more files in changeset.
Tuesday 12 May 2009
6:42 am

mseaton

update Learning struts and web config.

Options
    • -13
    • +31
    ./web.xml
Friday 17 Apr 2009
9:06 am

paulg

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

Options
    • -71
    • +70
    ./lams.tld
    • -13
    • +31
    ./web.xml
    • binary
    ./tags/AuthoringButton.tag
    • -9
    • +0
    ./tags/ExportPortOutput.tag
    • -13
    • +1
    ./tags/ProgressOutput.tag
    • -0
    • +136
    ./tags/TextSearch.tag
  7. … 50 more files in changeset.
Thursday 26 Mar 2009
11:00 am

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -0
    • +4
    ./applicationContext.xml
    • -109
    • +109
    ./struts/struts-config.xml
  3. … 117 more files in changeset.
Tuesday 17 Mar 2009
9:57 pm

Marcin Cieslak

file applicationContext.xml was initially added on branch lams2_3_spring_jboss_tune.

Options
    • -0
    • +0
    ./applicationContext.xml
  2. … 3 more files in changeset.
9:56 pm

Marcin Cieslak

LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

Options
    • -0
    • +4
    ./applicationContext.xml
    • -109
    • +109
    ./struts/struts-config.xml
  3. … 29 more files in changeset.
Monday 02 Mar 2009
3:40 am

Ernie Ghiglione

Oopps... it was UTF-8

Options
    • -2
    • +2
    ./web.xml
3:37 am

Ernie Ghiglione

Reverting wrong commit

Options
    • -14
    • +4
    ./web.xml
3:34 am

Ernie Ghiglione

LDEV-2152: adding next activity icon tto system activities

Options
    • -1
    • +10
    ./web.xml
    • -0
    • +1
    ./struts/struts-config.xml
  3. … 3 more files in changeset.
Thursday 26 Feb 2009
4:16 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • binary
    ./tags/AuthoringButton.tag
  2. … 23 more files in changeset.
Friday 20 Feb 2009
4:04 am

Ernie Ghiglione

LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

Options
    • -0
    • +1
    ./tags/FCKEditor.tag
  2. … 21 more files in changeset.
Friday 06 Feb 2009
3:36 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

Options
    • -1
    • +3
    ./tags/FCKEditor.tag
  2. … 25 more files in changeset.
3:11 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

Options
    • -14
    • +14
    ./tags/FCKEditor.tag
  2. … 40 more files in changeset.
Wednesday 04 Feb 2009
3:05 am

Ernie Ghiglione

LDEV-2113: Update FCKEditor.tag

Options
    • -1
    • +18
    ./tags/FCKEditor.tag
  2. … 4 more files in changeset.
Tuesday 13 Jan 2009
8:16 am

mseaton

LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

Options
    • -1
    • +1
    ./tags/ProgressOutput.tag
  2. … 1 more file in changeset.
7:58 am

mseaton

LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

Options
    • -1
    • +13
    ./tags/ProgressOutput.tag
  2. … 9 more files in changeset.
Monday 03 Nov 2008
4:28 am

Marcin Cieslak

LDEV-1932: Added competences to export portfolio both for teacher and learner.

Options
    • -0
    • +9
    ./tags/ExportPortOutput.tag
  2. … 7 more files in changeset.
Monday 22 Sep 2008
7:29 am

jliew

LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).

Options
    • -7
    • +1
    ./web.xml
  2. … 35 more files in changeset.
Tuesday 16 Sep 2008
5:18 am

Marcin Cieslak

LDEV-1299: Added some logic for the new "condition gate" that allows learners to pass depending on condition satisfaction.

Options
    • -0
    • +5
    ./struts/struts-config.xml
    • -0
    • +4
    ./struts/tiles-defs.xml
  3. … 35 more files in changeset.
Thursday 11 Sep 2008
4:23 am

Marcin Cieslak

LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

Options
    • -104
    • +109
    ./struts/struts-config.xml
    • -0
    • +4
    ./struts/tiles-defs.xml
  3. … 135 more files in changeset.
Friday 25 Jul 2008
9:49 am

Andrey Balan

LDEV-1811 lams.tld has been updated in all packages

Options
    • -0
    • +5
    ./lams.tld
  2. … 19 more files in changeset.
Tuesday 29 Apr 2008
2:52 am

asukkar

LDEV-1246

Renamed lams:out attribute escapeXml to escapeHtml

Options
    • -66
    • +66
    ./lams.tld
  2. … 15 more files in changeset.