lams / lams_tool_vote

web

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 14
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 21,610
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
    • -1
    • +0
    ./Template.jsp
    • -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
    • -11
    • +21
    ./WEB-INF/tags/HTMLEditor.tag
    • -2
    • +2
    ./authoring/BasicContent.jsp
    • -2
    • +2
    ./authoring/editNominationBox.jsp
    • -2
    • +2
    ./authoring/newNominationBox.jsp
    • -12
    • +12
    ./authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./includes/taglibs.jsp
    • -2
    • +2
    ./monitoring/editNominationBox.jsp
    • -2
    • +2
    ./monitoring/newNominationBox.jsp
  16. … 1082 more files in changeset.
Friday 19 Mar 2010
12:44 am

jliew

undoing change that shouldn't have been committed

Options
    • -2
    • +2
    ./learning/AnswersContent.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 17 Mar 2010
11:49 am

Andrey Balan

LDEV-2525 Include a minimum number of votes option

(merge from lams2_3_release)

Options
    • -19
    • +9
    ./authoring/AdvancedContent.jsp
    • -6
    • +48
    ./authoring/AuthoringMaincontent.jsp
    • -4
    • +3
    ./authoring/BasicContent.jsp
    • -2
    • +2
    ./authoring/InstructionsContent.jsp
    • -1
    • +1
    ./authoring/itemlist.jsp
    • -0
    • +1
    ./learning/AllNominations.jsp
    • -10
    • +13
    ./learning/AnswersContent.jsp
    • -0
    • +1
    ./learning/ExitLearning.jsp
    • -0
    • +1
    ./learning/IndividualLearnerResults.jsp
    • -0
    • +1
    ./learning/RevisitedAllNominations.jsp
    • -0
    • +8
    ./monitoring/SummaryContent.jsp
    • -1
    • +1
    ./monitoring/itemlist.jsp
  13. … 21 more files in changeset.
11:27 am

Andrey Balan

LDEV-2374 fixing bug with creation of new nominations

Options
    • -1
    • +1
    ./authoring/newNominationBox.jsp
Tuesday 16 Mar 2010
11:06 pm

Andrey Balan

if "Allow Text Entry" is on

then Max Votes and Min Votes get incremented by 1.

Options
    • -1
    • +1
    ./authoring/AdvancedContent.jsp
    • -2
    • +3
    ./authoring/AuthoringMaincontent.jsp
Wednesday 10 Mar 2010
3:59 pm

Andrey Balan

LDEV-2525 added a minimum number of votes option

Options
    • -3
    • +8
    ./authoring/AdvancedContent.jsp
    • -6
    • +47
    ./authoring/AuthoringMaincontent.jsp
    • -2
    • +2
    ./authoring/BasicContent.jsp
    • -2
    • +2
    ./authoring/InstructionsContent.jsp
    • -1
    • +1
    ./authoring/itemlist.jsp
    • -0
    • +1
    ./learning/AllNominations.jsp
    • -10
    • +13
    ./learning/AnswersContent.jsp
    • -0
    • +1
    ./learning/ExitLearning.jsp
    • -0
    • +1
    ./learning/IndividualLearnerResults.jsp
    • -0
    • +1
    ./learning/RevisitedAllNominations.jsp
    • -0
    • +8
    ./monitoring/SummaryContent.jsp
    • -1
    • +1
    ./monitoring/itemlist.jsp
  13. … 20 more files in changeset.
Thursday 14 Jan 2010
10:16 pm

Ernie Ghiglione

LDEV-2492: Display plural nominations if there's more than one answer

Options
    • -2
    • +12
    ./learning/AllNominations.jsp
    • -2
    • +10
    ./learning/RevisitedDisplay.jsp
    • -2
    • +13
    ./learning/RevisitedNoDisplay.jsp
  4. … 3 more files in changeset.
10:13 pm

Ernie Ghiglione

LDEV-2492: Display plural nominations if there's more than one answer

Options
    • -2
    • +12
    ./learning/AllNominations.jsp
    • -2
    • +10
    ./learning/RevisitedDisplay.jsp
    • -2
    • +13
    ./learning/RevisitedNoDisplay.jsp
  4. … 3 more files in changeset.
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
    • -2
    • +2
    ./learning/AnswersContent.jsp
  2. … 45 more files in changeset.
Wednesday 16 Sep 2009
5:46 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -2
    • +2
    ./learning/AllNominations.jsp
    • -2
    • +2
    ./learning/ExitLearning.jsp
    • -2
    • +2
    ./learning/IndividualLearnerResults.jsp
    • -4
    • +4
    ./learning/Notebook.jsp
    • -2
    • +2
    ./learning/RevisitedAllNominations.jsp
    • -11
    • +11
    ./learning/RunOffline.jsp
5:44 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -2
    • +2
    ./learning/AllNominations.jsp
    • -2
    • +2
    ./learning/ExitLearning.jsp
    • -2
    • +2
    ./learning/IndividualLearnerResults.jsp
    • -4
    • +4
    ./learning/Notebook.jsp
    • -2
    • +2
    ./learning/RevisitedAllNominations.jsp
    • -11
    • +11
    ./learning/RunOffline.jsp
Wednesday 26 Aug 2009
3:11 am

Ernie Ghiglione

LDEV-2427: fix thin next activity button in IE7

Options
    • -4
    • +2
    ./learning/AllNominations.jsp
2:55 am

Ernie Ghiglione

LDEV-2427: fix thin next activity button in IE7

Options
    • -4
    • +2
    ./learning/AllNominations.jsp
Tuesday 28 Jul 2009
8:10 pm

Marcin Cieslak

LDEV-2397: Fixed a bug in create nomination sequence.

Options
    • -10
    • +12
    ./authoring/BasicContent.jsp
  2. … 1 more file in changeset.
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
    • -3
    • +0
    ./common/tabbedheader.jsp
    • -2
    • +0
    ./monitoring/LearnerRep.jsp
  7. … 92 more files in changeset.
Monday 27 Jul 2009
5:13 am

Ernie Ghiglione

LDEV-2185: Merging from branch to head

Options
    • -1
    • +1
    ./learning/RevisitedDisplay.jsp
4:38 am

Ernie Ghiglione

LDEV-2185: Fixing output when reviewing the vote after finishing activity

Options
    • -1
    • +1
    ./learning/RevisitedDisplay.jsp
12:17 am

Marcin Cieslak

LDEV-2374:

- Vote now accepts nominations created by Teacher as well as ones derived from input.

- Teacher can now limit number of Learners contributing to Vote's nomination pool.

- Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -0
    • +15
    ./authoring/AdvancedContent.jsp
    • -2
    • +7
    ./authoring/AuthoringMaincontent.jsp
    • -18
    • +10
    ./authoring/BasicContent.jsp
  4. … 47 more files in changeset.
Tuesday 07 Jul 2009
2:33 am

jliew

doesn't belong

Options
    • binary
    ./images/Thumbs.db
  2. … 1 more file in changeset.
Thursday 02 Jul 2009
2:59 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -3
    • +35
    ./authoring/BasicContent.jsp
    • -1
    • +4
    ./authoring/itemlist.jsp
    • -1
    • +1
    ./authoring/newNominationBox.jsp
  4. … 83 more files in changeset.
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
    • -1
    • +5
    ./WEB-INF/web.xml
  2. … 214 more files in changeset.
Wednesday 01 Jul 2009
4:39 am

jliew

Merge lams2_3 into head

Options
    • -3
    • +5
    ./learning/AllNominations.jsp
  2. … 162 more files in changeset.
Tuesday 30 Jun 2009
5:04 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -1
    • +5
    ./WEB-INF/web.xml
  2. … 57 more files in changeset.
Wednesday 03 Jun 2009
4:42 am

mseaton

LDEV-2363 Fix duplicate open vote (text entry).

Options
    • -3
    • +5
    ./learning/AllNominations.jsp
  2. … 1 more file in changeset.
Wednesday 13 May 2009
2:23 pm

Marcin Cieslak

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

Options
    • -1
    • +5
    ./WEB-INF/web.xml
  2. … 10 more files in changeset.
Friday 10 Apr 2009
1:47 am

Ernie Ghiglione

LDEV-2185: missing the userEntry bit

Options
    • -1
    • +1
    ./learning/AllNominations.jsp
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.