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 16 Feb 2011
5:56 pm

Andrey Balan

LDEV-2648 Removed Finish button

*merge from HEAD

Options
    • -9
    • +1
    ./pages/learning/learning.jsp
  2. … 2 more files in changeset.
5:49 pm

Andrey Balan

LDEV-2648 Removed Finish button

Options
    • -9
    • +1
    ./pages/learning/learning.jsp
  2. … 2 more files in changeset.
Sunday 13 Feb 2011
8:13 pm

Andrey Balan

LDEV-2645 fixing status variables that got messed up

*merge from lams2_3_release

Options
    • -7
    • +7
    ./pages/learning/parts/ordering.jsp
8:09 pm

Andrey Balan

LDEV-2645 fixing status variables that got messed up

Options
    • -7
    • +7
    ./pages/learning/parts/ordering.jsp
Monday 07 Feb 2011
10:14 pm

Andrey Balan

LDEV-1730 If Tool is not group do now show the group reference

Options
    • -3
    • +5
    ./pages/monitoring/summary.jsp
  2. … 4 more files in changeset.
Wednesday 15 Dec 2010
12:36 pm

Andrey Balan

LDEV-2622 reinitializes thickbox after moving the questions

*merge from HEAD

Options
    • -0
    • +9
    ./pages/authoring/basic.jsp
12:13 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -0
    • +1
    ./pages/authoring/parts/overallfeedbacklist.jsp
Tuesday 14 Dec 2010
10:21 pm

Andrey Balan

LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

Options
    • -3
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -3
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -6
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -3
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
9:57 pm

Andrey Balan

LDEV-2622 reinitializes thickbox after moving the questions

Options
    • -0
    • +9
    ./pages/authoring/basic.jsp
1:22 am

Andrey Balan

LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

Options
    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -9
    • +9
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +5
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +5
    ./pages/authoring/parts/addshortanswer.jsp
12:53 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -1
    • +1
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
12:43 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -1
    • +0
    ./common/header.jsp
    • -1
    • +0
    ./common/tabbedheader.jsp
    • -449
    • +0
    ./includes/css/jqGrid.grid.css
    • -0
    • +295
    ./includes/css/jquery-ui-1.8.6.custom.css
    • -0
    • +138
    ./includes/css/ui.jqgrid.css
    • binary
    ./includes/images/jqGrid.basic.theme/cd_run.gif
    • binary
    ./includes/images/jqGrid.basic.theme/dirty.gif
    • binary
    ./includes/images/jqGrid.basic.theme/down.gif
    • binary
    ./includes/images/jqGrid.basic.theme/find.gif
    • binary
    ./includes/images/jqGrid.basic.theme/first.gif
    • binary
    ./includes/images/jqGrid.basic.theme/folder.png
    • binary
    ./includes/images/jqGrid.basic.theme/grid-blue-ft.gif
    • binary
    ./includes/images/jqGrid.basic.theme/grid-blue-hd.gif
    • binary
    ./includes/images/jqGrid.basic.theme/headerbg.gif
    • binary
    ./includes/images/jqGrid.basic.theme/headerleft.gif
  16. … 132 more files in changeset.
Sunday 12 Dec 2010
3:35 pm

Marcin Cieslak

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner.

The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

Options
    • -486
    • +645
    ./includes/javascript/jquery.form.js
  2. … 2 more files in changeset.
3:29 pm

Marcin Cieslak

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

Options
    • -7
    • +14
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Sunday 05 Dec 2010
9:48 pm

Marcin Cieslak

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

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

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
8:11 am

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.
Wednesday 17 Nov 2010
11:19 pm

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
12: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
Thursday 11 Nov 2010
9:03 pm

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
Thursday 04 Nov 2010
9:22 pm

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
3: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.
Thursday 21 Oct 2010
8:50 pm

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
1: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
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
    • -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
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-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-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Tuesday 02 Mar 2010
2:12 pm

Andrey Balan

LDEV-2516 removing debug output

Options
    • -2
    • +1
    ./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
    • -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.
Monday 01 Mar 2010
10:04 pm

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