lams / lams_tool_laqa

web

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): 24,070
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
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
    • -2
    • +2
    ./WEB-INF/lams.tld
    • -5
    • +1
    ./WEB-INF/web.xml
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • binary
    ./WEB-INF/tags/FCKEditor.tag
    • -2
    • +2
    ./authoring/BasicContent.jsp
    • -2
    • +2
    ./authoring/editQuestionBox.jsp
    • -3
    • +3
    ./authoring/newQuestionBox.jsp
    • -6
    • +6
    ./authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./includes/taglibs.jsp
    • -4
    • +3
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +3
    ./learning/SequentialAnswersContent.jsp
    • -2
    • +2
    ./monitoring/editQuestionBox.jsp
    • -2
    • +2
    ./monitoring/newQuestionBox.jsp
  16. … 1082 more files in changeset.
Thursday 10 Jun 2010
2:44 am

lfoxton

LDEV-2552 MErging changes with head

Options
    • -2
    • +1
    ./authoring/BasicContent.jsp
    • -1
    • +1
    ./authoring/newQuestionBox.jsp
2:42 am

lfoxton

LDEV-2552 Fixing a cognitive skills wizard bug that resizes the new question iframe when it shouldnt be resized

Options
    • -2
    • +1
    ./authoring/BasicContent.jsp
    • -1
    • +1
    ./authoring/newQuestionBox.jsp
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.
Wednesday 20 Jan 2010
3:15 pm

Andrey Balan

LDEV-2498 merge from HEAD to lams2_3_release branch

Options
    • -1
    • +1
    ./authoring/BasicContent.jsp
3:00 pm

Andrey Balan

LDEV-2498 Increased the width for Q&A iframe

Options
    • -1
    • +1
    ./authoring/BasicContent.jsp
Monday 16 Nov 2009
3:25 am

jliew

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

Options
    • -15
    • +15
    ./admin/config.jsp
    • -1
    • +1
    ./authoring/newQuestionBox.jsp
    • -2
    • +2
    ./includes/jsp/qaWizardCommon.jsp
  4. … 43 more files in changeset.
Friday 13 Nov 2009
4:13 am

jliew

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

Options
    • -15
    • +15
    ./admin/config.jsp
    • -1
    • +1
    ./authoring/newQuestionBox.jsp
    • -2
    • +2
    ./includes/jsp/qaWizardCommon.jsp
    • -1
    • +1
    ./learning/AnswersContent.jsp
  5. … 44 more files in changeset.
2:41 am

jliew

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

Options
    • -1
    • +1
    ./learning/AnswersContent.jsp
Wednesday 16 Sep 2009
10:23 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +3
    ./learning/IndividualLearnerResults.jsp
    • -3
    • +3
    ./learning/LearnerRep.jsp
10:21 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +3
    ./learning/IndividualLearnerResults.jsp
    • -3
    • +3
    ./learning/LearnerRep.jsp
6:03 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -4
    • +4
    ./learning/Notebook.jsp
6:02 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -4
    • +4
    ./learning/Notebook.jsp
3:59 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./learning/LearnerRep.jsp
    • -7
    • +5
    ./learning/Notebook.jsp
    • -1
    • +1
    ./learning/RevisitedLearnerRep.jsp
    • -3
    • +3
    ./learning/RunOffline.jsp
  6. … 6 more files in changeset.
3:58 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./learning/LearnerRep.jsp
    • -7
    • +5
    ./learning/Notebook.jsp
    • -1
    • +1
    ./learning/RevisitedLearnerRep.jsp
    • -3
    • +3
    ./learning/RunOffline.jsp
  6. … 6 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
    • binary
    ./WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
    • -5
    • +0
    ./common/fckeditorheader.jsp
    • -1
    • +0
    ./common/header.jsp
    • -1
    • +0
    ./common/tabbedheader.jsp
    • -2
    • +0
    ./monitoring/LearnerRep.jsp
  7. … 92 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
    • -2
    • +6
    ./WEB-INF/web.xml
    • -1
    • +8
    ./authoring/AdvancedContent.jsp
    • -2
    • +2
    ./authoring/addCondition.jsp
    • -189
    • +189
    ./authoring/newQuestionBox.jsp
    • -2
    • +11
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +13
    ./learning/SequentialAnswersContent.jsp
  7. … 209 more files in changeset.
Tuesday 30 Jun 2009
5:04 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -2
    • +6
    ./WEB-INF/web.xml
  2. … 57 more files in changeset.
Monday 25 May 2009
2:29 am

lfoxton

Fixing problem with qa coginitive skills wizard. New version of jquery was clashing with prototype, so used an older version

Options
    • -189
    • +189
    ./authoring/newQuestionBox.jsp
Wednesday 13 May 2009
2:10 pm

Marcin Cieslak

LDEV-2071: Added initial version of LAMS 2.3 on JBoss 5.1.

Options
    • -2
    • +6
    ./WEB-INF/web.xml
  2. … 28 more files in changeset.
Monday 11 May 2009
6:40 am

lfoxton

LDEV-2253 Giving the option in qa for rich text editor in learner - updating the language key

Options
    • -1
    • +1
    ./authoring/AdvancedContent.jsp
  2. … 2 more files in changeset.
6:36 am

lfoxton

LDEV-2253 Giving the option in qa for rich text editor in learner

Options
    • -1
    • +8
    ./authoring/AdvancedContent.jsp
    • -2
    • +11
    ./learning/CombinedAnswersContent.jsp
    • -4
    • +13
    ./learning/SequentialAnswersContent.jsp
  4. … 11 more files in changeset.
Friday 08 May 2009
12:16 pm

Marcin Cieslak

LDEV-2326: Buttons in Condition form had argument href="#' which caused the page to reload. It was changed to href="javascript:;".

Options
    • -2
    • +2
    ./authoring/addCondition.jsp
  2. … 4 more files in changeset.
Thursday 26 Mar 2009
11:00 am

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -13
    • +13
    ./WEB-INF/web.xml
  2. … 118 more files in changeset.
Thursday 19 Mar 2009
2:54 am

Marcin Cieslak

LDEV-2174:

Merged "context.tool" and "context.central" due to Locator inheritance bug in Spring.

Removed redundant Quartz Scheduler.

Options
    • -1
    • +1
    ./WEB-INF/web.xml
  2. … 26 more files in changeset.
Tuesday 17 Mar 2009
10:11 pm

Marcin Cieslak

LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

Options
    • -13
    • +13
    ./WEB-INF/web.xml
  2. … 80 more files in changeset.
Wednesday 11 Mar 2009
3:29 pm

Marcin Cieslak

LDEV-1998: Added "Clear entry" icon in activities with collections of entries.

Options
    • -13
    • +38
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 17 more files in changeset.