lams

lams_tool_vote

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 15
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 68,818
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
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/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/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Friday 19 Nov 2010
9:01 pm

Ernie Ghiglione

LDEV-2598: Updating Swedish

Options
    • -4
    • +20
    ./conf/language/lams/ApplicationResources_sv_SE.properties
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/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Sunday 07 Nov 2010
12:11 pm

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.
12:11 pm

Ernie Ghiglione

LDEV-2598: Adding Slovenian. Updating Spanish (MX), Korean

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -25
    • +28
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -0
    • +168
    ./conf/language/lams/ApplicationResources_sl_SI.properties
Thursday 04 Nov 2010
9:22 pm

Marcin Cieslak

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

Options
    • -17
    • +27
    ./web/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/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/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/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
    • -6
    • +2
    ./test/web/WEB-INF/web.xml
    • -1
    • +0
    ./web/Template.jsp
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -5
    • +1
    ./web/WEB-INF/web.xml
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • binary
    ./web/WEB-INF/tags/FCKEditor.tag
    • -11
    • +21
    ./web/WEB-INF/tags/HTMLEditor.tag
    • -2
    • +2
    ./web/authoring/BasicContent.jsp
    • -2
    • +2
    ./web/authoring/editNominationBox.jsp
    • -2
    • +2
    ./web/authoring/newNominationBox.jsp
    • -12
    • +12
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/includes/taglibs.jsp
    • -2
    • +2
    ./web/monitoring/editNominationBox.jsp
  16. … 1082 more files in changeset.
Friday 16 Apr 2010
9:04 am

Ernie Ghiglione

Adding Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Maori, Norwegian, Turkish

Options
    • -131
    • +132
    ./conf/language/lams/ApplicationResources.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -131
    • +132
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +168
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -73
    • +76
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -130
    • +132
    ./conf/language/lams/ApplicationResources_tr_TR.properties
9:03 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. … 2 more files in changeset.
Friday 19 Mar 2010
12:44 am

jliew

undoing change that shouldn't have been committed

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

Andrey Balan

LDEV-2525 Include a minimum number of votes option

(merge from lams2_3_release)

Options
    • -1
    • +1
    ./build.properties
    • -1
    • +17
    ./build.xml
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./db/sql/create_lams_tool_vote.sql
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java
    • -1
    • +29
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql
    • -20
    • +39
    ./src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
  16. … 18 more files in changeset.
11:27 am

Andrey Balan

LDEV-2374 fixing bug with creation of new nominations

Options
    • -1
    • +1
    ./web/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
    ./web/authoring/AdvancedContent.jsp
    • -2
    • +3
    ./web/authoring/AuthoringMaincontent.jsp
10:18 pm

Andrey Balan

LDEV-2535 fixed Voting exception at importing sequences

Options
    • -1
    • +1
    ./db/sql/create_lams_tool_vote.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
8:59 pm

Andrey Balan

LDEV-2535 fixed Voting exception at importing sequences

Options
    • -1
    • +1
    ./db/sql/create_lams_tool_vote.sql
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql
Wednesday 10 Mar 2010
4:02 pm

Andrey Balan

file patch20100309_updateTo235.sql was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql
3:59 pm

Andrey Balan

LDEV-2525 added a minimum number of votes option

Options
    • -1
    • +1
    ./build.properties
    • -1
    • +17
    ./build.xml
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./db/sql/create_lams_tool_vote.sql
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java
    • -1
    • +29
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql
    • -1
    • +17
    ./src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
  16. … 17 more files in changeset.
Wednesday 03 Mar 2010
7:54 am

Ernie Ghiglione

Updating translations for LAMS 2.3.4

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -126
    • +137
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -133
    • +134
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  10. … 30 more files in changeset.
Friday 19 Feb 2010
5:47 am

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -132
    • +132
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -132
    • +132
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -132
    • +132
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -131
    • +131
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -133
    • +134
    ./conf/language/lams/ApplicationResources_no_NO.properties
  8. … 117 more files in changeset.
Wednesday 10 Feb 2010
2:16 am

Ernie Ghiglione

Updating German and French

Options
    • -119
    • +133
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -135
    • +136
    ./conf/language/lams/ApplicationResources_fr_FR.properties
Tuesday 02 Feb 2010
1:26 am

Ernie Ghiglione

Updating Greek

Options
    • -9
    • +9
    ./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
    • -12
    • +13
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 18 more files in changeset.
Thursday 28 Jan 2010
4:03 am

Ernie Ghiglione

Updating Norwegian and Greek

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
Thursday 14 Jan 2010
10:16 pm

Ernie Ghiglione

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

Options
    • -9
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +12
    ./web/learning/AllNominations.jsp
    • -2
    • +10
    ./web/learning/RevisitedDisplay.jsp
    • -2
    • +13
    ./web/learning/RevisitedNoDisplay.jsp