lams / lams_tool_assessment

web

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 9
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 23,289
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
Wednesday 24 Nov 2010
2:34 am

Marcin Cieslak

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 26 more files in changeset.
Monday 22 Nov 2010
3:11 pm

Marcin Cieslak

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

Options
    • -0
    • +4
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Thursday 18 Nov 2010
6:19 am

Marcin Cieslak

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.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Monday 15 Nov 2010
7:48 pm

Andrey Balan

LDEV-2569 fixed problem with 2 ordering question on the same page

*merge from lams2_3_release

Options
    • -1
    • +3
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/parts/ordering.jsp
Friday 12 Nov 2010
4:03 am

Andrey Balan

LDEV-2569 fixed problem with 2 ordering question on the same page

Options
    • -1
    • +2
    ./pages/learning/learning.jsp
    • -1
    • +2
    ./pages/learning/parts/ordering.jsp
Friday 05 Nov 2010
4:22 am

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -17
    • +27
    ./WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Sunday 24 Oct 2010
9:36 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Friday 22 Oct 2010
2:50 am

Marcin Cieslak

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

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

Marcin Cieslak

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

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
6: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
    • -8
    • +1
    ./WEB-INF/web.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -129
    • +0
    ./WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -2
    • +2
    ./WEB-INF/tlds/lams/lams.tld
    • -1
    • +0
    ./common/taglibs.jsp
    • -3
    • +3
    ./includes/javascript/assessmentoption.js
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -6
    • +6
    ./pages/authoring/parts/addessay.jsp
    • -7
    • +7
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -17
    • +17
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -7
    • +7
    ./pages/authoring/parts/addnumerical.jsp
    • -14
    • +14
    ./pages/authoring/parts/addordering.jsp
    • -7
    • +7
    ./pages/authoring/parts/addshortanswer.jsp
    • -12
    • +12
    ./pages/authoring/parts/addtruefalse.jsp
  16. … 1082 more files in changeset.
Thursday 18 Mar 2010
8:58 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
8:13 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Tuesday 02 Mar 2010
9:12 pm

Andrey Balan

LDEV-2516 removing debug output

Options
    • -2
    • +1
    ./pages/learning/parts/truefalse.jsp
9:10 pm

Andrey Balan

LDEV-2516 Show wrong and right answers separately

(merge from lams2_3_release branch to HEAD)

Options
    • -3
    • +11
    ./pages/authoring/advance.jsp
    • -5
    • +7
    ./pages/learning/parts/matchingpairs.jsp
    • -13
    • +15
    ./pages/learning/parts/multiplechoice.jsp
    • -9
    • +9
    ./pages/learning/parts/numerical.jsp
    • -9
    • +9
    ./pages/learning/parts/shortanswer.jsp
    • -13
    • +32
    ./pages/learning/parts/truefalse.jsp
    • -2
    • +18
    ./pages/monitoring/parts/advanceoptions.jsp
  8. … 7 more files in changeset.
5:04 am

Andrey Balan

LDEV-2500 Increased the size of the fckeditor area

(Merge from Head)

Options
    • -2
    • +2
    ./pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -6
    • +6
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -5
    • +5
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -4
    • +4
    ./pages/authoring/parts/addtruefalse.jsp
    • -3
    • +3
    ./pages/authoring/parts/matchingpairoption.jsp
    • -1
    • +1
    ./pages/authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./pages/authoring/parts/option.jsp
    • -1
    • +1
    ./pages/authoring/parts/orderingoption.jsp
    • -3
    • +3
    ./pages/authoring/parts/shortansweroption.jsp
4:58 am

Andrey Balan

LDEV-2500 Increased the size of the fckeditor area

Options
    • -2
    • +2
    ./pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -6
    • +6
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -5
    • +5
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -4
    • +4
    ./pages/authoring/parts/addtruefalse.jsp
    • -3
    • +3
    ./pages/authoring/parts/matchingpairoption.jsp
    • -1
    • +1
    ./pages/authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./pages/authoring/parts/option.jsp
    • -1
    • +1
    ./pages/authoring/parts/orderingoption.jsp
    • -3
    • +3
    ./pages/authoring/parts/shortansweroption.jsp
Friday 26 Feb 2010
7:47 am

Andrey Balan

LDEV-2516 Show wrong and right answers separately

Options
    • -3
    • +11
    ./pages/authoring/advance.jsp
    • -5
    • +7
    ./pages/learning/parts/matchingpairs.jsp
    • -13
    • +15
    ./pages/learning/parts/multiplechoice.jsp
    • -9
    • +9
    ./pages/learning/parts/numerical.jsp
    • -9
    • +9
    ./pages/learning/parts/shortanswer.jsp
    • -13
    • +33
    ./pages/learning/parts/truefalse.jsp
    • -2
    • +18
    ./pages/monitoring/parts/advanceoptions.jsp
  8. … 7 more files in changeset.
Thursday 14 Jan 2010
6:16 am

Ernie Ghiglione

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    ./pages/learning/parts/multiplechoice.jsp
6:05 am

Ernie Ghiglione

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    ./pages/learning/parts/multiplechoice.jsp
Friday 18 Dec 2009
6:05 am

Andrey Balan

LDEV-2478 merge from HEAD to lams2_3_release branch

Options
    • -0
    • +5
    ./pages/authoring/parts/addessay.jsp
    • -1
    • +11
    ./pages/learning/parts/essay.jsp
  3. … 7 more files in changeset.
Tuesday 15 Dec 2009
9:58 pm

Andrey Balan

LDEV-2478 added Option to allow the student to have a rich text editor to answer

Options
    • -0
    • +5
    ./pages/authoring/parts/addessay.jsp
    • -1
    • +11
    ./pages/learning/parts/essay.jsp
  3. … 7 more files in changeset.
Monday 16 Nov 2009
10:25 am

jliew

LDEV-2459 LDEV-2462 surround i18n messages with double quotes when outputting to html or javascript

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -4
    • +4
    ./pages/export/parts/exportlearner.jsp
    • -5
    • +5
    ./pages/export/parts/exportteacher.jsp
    • -5
    • +5
    ./pages/monitoring/summary.jsp
    • -3
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
    • -4
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  7. … 40 more files in changeset.
Friday 13 Nov 2009
11:13 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -4
    • +4
    ./pages/export/parts/exportlearner.jsp
    • -5
    • +5
    ./pages/export/parts/exportteacher.jsp
    • -5
    • +5
    ./pages/monitoring/summary.jsp
    • -3
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
    • -4
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  7. … 42 more files in changeset.
Monday 14 Sep 2009
1:08 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -3
    • +3
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/runoffline.jsp
  3. … 4 more files in changeset.
1:02 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -3
    • +3
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/runoffline.jsp
  3. … 2 more files in changeset.
Wednesday 05 Aug 2009
5:13 pm

Andrey Balan

LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

merge HEAD into lams2_3_release branch

Options
    • -2
    • +2
    ./pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
3:15 am

Andrey Balan

LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

Options
    • -2
    • +2
    ./pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
1:37 am

Andrey Balan

LDEV-2114 improving learning design (affects only IE)

Options
    • -2
    • +2
    ./pages/learning/learning.jsp
Tuesday 28 Jul 2009
10: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
    • -1
    • +0
    ./common/fckeditorheader.jsp
    • -1
    • +0
    ./pages/authoring/authoring.jsp
    • -1
    • +0
    ./pages/authoring/definelater.jsp
  4. … 95 more files in changeset.
Friday 24 Jul 2009
2:02 am

Andrey Balan

LDEV-2387 Changed rendering of FCKEditor in Assessment and Notebook tool

* removed commented script part from FCKEditor.tag

* removed all references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
    • -4
    • +0
    ./common/fckeditorheader.jsp
  4. … 3 more files in changeset.