lams

lams_tool_assessment

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 11
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 41,949
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 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
    • -134
    • +152
    ./test/java/org/lamsfoundation/lams/tool/assessment/selenium/TestAssessment.java
    • -8
    • +1
    ./web/WEB-INF/web.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -129
    • +0
    ./web/WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -3
    • +3
    ./web/includes/javascript/assessmentoption.js
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
    • -6
    • +6
    ./web/pages/authoring/parts/addessay.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -17
    • +17
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addnumerical.jsp
    • -14
    • +14
    ./web/pages/authoring/parts/addordering.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addshortanswer.jsp
  16. … 1082 more files in changeset.
Friday 16 Apr 2010
8:36 am

Ernie Ghiglione

Adding Slovenian and Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Norwegian

Options
    • -191
    • +191
    ./conf/language/lams/ApplicationResources.properties
    • -190
    • +192
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -191
    • +191
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -191
    • +191
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -193
    • +193
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -191
    • +191
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -191
    • +191
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_sl_SI.properties
8:36 am

Ernie Ghiglione

file ApplicationResources_sl_SI.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_sl_SI.properties
  2. … 1 more file in changeset.
8:31 am

Ernie Ghiglione

file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
  2. … 5 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
    • -1
    • +1
    ./web/WEB-INF/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
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Wednesday 03 Mar 2010
7:33 am

Ernie Ghiglione

Updating translations for LAMS 2.3.4

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 132 more files in changeset.
Tuesday 02 Mar 2010
9:15 pm

Andrey Balan

LDEV-2504

fixing AssessmentBundler so that now it will properly export auxiliary js and image files

Options
    • -9
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java
2:12 pm

Andrey Balan

LDEV-2516 removing debug output

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

Andrey Balan

LDEV-2516 Show wrong and right answers separately

(merge from lams2_3_release branch to HEAD)

Options
    • -1
    • +1
    ./build.properties
    • -4
    • +5
    ./db/sql/create_lams_tool_assessment.sql
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20100225_updateTo234.sql
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -7
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -3
    • +11
    ./web/pages/authoring/advance.jsp
    • -5
    • +7
    ./web/pages/learning/parts/matchingpairs.jsp
    • -13
    • +15
    ./web/pages/learning/parts/multiplechoice.jsp
    • -9
    • +9
    ./web/pages/learning/parts/numerical.jsp
    • -9
    • +9
    ./web/pages/learning/parts/shortanswer.jsp
    • -13
    • +32
    ./web/pages/learning/parts/truefalse.jsp
    • -2
    • +18
    ./web/pages/monitoring/parts/advanceoptions.jsp
Monday 01 Mar 2010
10:04 pm

Andrey Balan

LDEV-2500 Increased the size of the fckeditor area

(Merge from Head)

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

Andrey Balan

LDEV-2500 Increased the size of the fckeditor area

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

Andrey Balan

LDEV-2518 Penalty factor to be 0 by default

rolling back changes in sql script as LDEV-2516 (Show wrong and right answers separately) doesn't affect Lams 2.4 version

Options
    • -5
    • +4
    ./db/sql/create_lams_tool_assessment.sql
Friday 26 Feb 2010
8:12 am

Ernie Ghiglione

Updating English

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
8:12 am

Ernie Ghiglione

Adding Spanish to branch

Options
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 1 more file in changeset.
8:08 am

Ernie Ghiglione

LDEV-2518: Default penalty factor to 0

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
8:04 am

Ernie Ghiglione

file ApplicationResources_es_ES.properties was added on branch lams2_3_release on 2010-02-26 07:12:25 +0000

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_ES.properties
8:04 am

Ernie Ghiglione

Adding Spanish, updating English

Options
    • -189
    • +191
    ./conf/language/lams/ApplicationResources.properties
    • -189
    • +191
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_es_ES.properties
7:50 am

Ernie Ghiglione

LDEV-2518: Default penalty factor to 0

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
7:47 am

Ernie Ghiglione

LDEV-2518: Default penalty factor to 0

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
7:41 am

Ernie Ghiglione

LDEV-2518: Default penalty factor to 0

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
6:05 am

Ernie Ghiglione

LDEV-2518: penalty factor to be 0 by default

Options
    • -4
    • +5
    ./db/sql/create_lams_tool_assessment.sql
6:01 am

Ernie Ghiglione

LDEV-2518: penalty factor to be 0 by default

Options
    • -1
    • +1
    ./db/sql/create_lams_tool_assessment.sql
12:47 am

Andrey Balan

LDEV-2516 Show wrong and right answers separately

Options
    • -1
    • +1
    ./build.properties
    • -3
    • +4
    ./db/sql/create_lams_tool_assessment.sql
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20100225_updateTo234.sql
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -7
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -3
    • +11
    ./web/pages/authoring/advance.jsp
    • -5
    • +7
    ./web/pages/learning/parts/matchingpairs.jsp
    • -13
    • +15
    ./web/pages/learning/parts/multiplechoice.jsp
    • -9
    • +9
    ./web/pages/learning/parts/numerical.jsp
    • -9
    • +9
    ./web/pages/learning/parts/shortanswer.jsp
    • -13
    • +33
    ./web/pages/learning/parts/truefalse.jsp
    • -2
    • +18
    ./web/pages/monitoring/parts/advanceoptions.jsp
12:47 am

Andrey Balan

file patch20100225_updateTo234.sql was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20100225_updateTo234.sql
Friday 19 Feb 2010
5:57 am

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -188
    • +188
    ./conf/language/lams/ApplicationResources.properties
    • -205
    • +205
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -200
    • +200
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -188
    • +188
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -202
    • +202
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -205
    • +205
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 94 more files in changeset.
Tuesday 02 Feb 2010
1:26 am

Ernie Ghiglione

Updating Greek

Options
    • -12
    • +12
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 17 more files in changeset.
Friday 29 Jan 2010
5:54 am

Ernie Ghiglione

Updating Greek

Options
    • -15
    • +15
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 18 more files in changeset.
Thursday 28 Jan 2010
4:05 am

Ernie Ghiglione

Updating German

Options
    • -0
    • +244
    ./conf/language/lams/ApplicationResources_de_DE.properties
  2. … 1 more file in changeset.
Wednesday 13 Jan 2010
11:16 pm

Ernie Ghiglione

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    ./web/pages/learning/parts/multiplechoice.jsp