lams

lams_tool_forum

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 44,443
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
6: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
    ./build.xml
    • -1
    • +1
    ./conf/xdoclet/servlet-mappings.xml
    • -9
    • +1
    ./conf/xdoclet/taglibs.xml
    • -89
    • +92
    ./test/java/org/lamsfoundation/lams/tool/forum/selenium/TestForum.java
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -16
    • +18
    ./web/WEB-INF/struts-config.xml
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/includes/taglibs.jsp
    • -2
    • +2
    ./web/jsps/authoring/basic.jsp
    • -10
    • +10
    ./web/jsps/authoring/pedagogicalPlannerForm.jsp
    • -2
    • +2
    ./web/jsps/authoring/message/create.jsp
    • -2
    • +2
    ./web/jsps/authoring/message/edit.jsp
  16. … 1082 more files in changeset.
Friday 16 Apr 2010
2:41 pm

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. … 6 more files in changeset.
2:41 pm

Ernie Ghiglione

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

Options
    • -176
    • +179
    ./conf/language/lams/ApplicationResources.properties
    • -175
    • +179
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -176
    • +179
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -176
    • +180
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +221
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -175
    • +179
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -124
    • +129
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -175
    • +179
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -175
    • +179
    ./conf/language/lams/ApplicationResources_tr_TR.properties
Wednesday 14 Apr 2010
8:09 pm

Andrey Balan

LDEV-1743 adding missing js file

Options
    • -0
    • +2
    ./web/jsps/authoring/definelater.jsp
8:02 pm

Andrey Balan

LDEV-1743 adding missing js file

Options
    • -0
    • +2
    ./web/jsps/authoring/definelater.jsp
Tuesday 06 Apr 2010
6:15 pm

Andrey Balan

LDEV-2546 removing try-catch block

Options
    • -16
    • +10
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
1:27 am

Andrey Balan

LDEV-2546 fixing error with Deletion of topics

*merge from lams2_3_release

Options
    • -15
    • +17
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  2. … 1 more file in changeset.
1:19 am

Andrey Balan

LDEV-2546 fixing error with Deletion of topics

Options
    • -15
    • +17
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  2. … 1 more file in changeset.
Friday 02 Apr 2010
1:08 am

Andrey Balan

LDEV-1743 adding ability to remove/update and change order of threads

*merge to lams2_3_release

Options
    • -1
    • +1
    ./build.properties
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +12
    ./conf/xdoclet/struts-actions.xml
    • -3
    • +4
    ./db/sql/create_lams_tool_forum.sql
    • -1
    • +1
    ./db/sql/table-schema.sql
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20100303_updateTo24.sql
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -366
    • +376
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -17
    • +14
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageComparator.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageDtoComparator.java
    • -101
    • +152
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  16. … 11 more files in changeset.
Thursday 25 Mar 2010
5:32 am

Andrey Balan

LDEV-1743

* fixed problem with deletion of topics and according conditions

* fixed hibernate query

* fixed wrong equal check

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
    • -34
    • +34
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
Tuesday 23 Mar 2010
11:30 pm

Andrey Balan

file MessageComparator.java was added on branch lams2_3_release on 2010-04-01 17:08:32 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageComparator.java
11:30 pm

Andrey Balan

file MessageDtoComparator.java was added on branch lams2_3_release on 2010-04-01 17:08:32 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageDtoComparator.java
11:30 pm

Andrey Balan

file patch20100303_updateTo24.sql was added on branch lams2_3_release on 2010-04-01 17:08:32 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20100303_updateTo24.sql
11:30 pm

Andrey Balan

LDEV-1743 added ability to remove/update and change order of threads

Options
    • -1
    • +1
    ./build.properties
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -9
    • +12
    ./conf/xdoclet/struts-actions.xml
    • -3
    • +4
    ./db/sql/create_lams_tool_forum.sql
    • -1
    • +1
    ./db/sql/table-schema.sql
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20100303_updateTo24.sql
    • -366
    • +376
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -17
    • +14
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageComparator.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/forum/util/MessageDtoComparator.java
    • -68
    • +119
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
    • -5
    • +11
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringConditionAction.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  16. … 6 more files in changeset.
Thursday 18 Mar 2010
8: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.
8: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.
7:30 pm

Ernie Ghiglione

LDEV-2541: show only relevant messages for posting limitations

Options
    • -23
    • +22
    ./web/jsps/learning/viewtopic.jsp
7:27 pm

Ernie Ghiglione

LDEV-2541: show only relevant messages for posting limitations

Options
    • -22
    • +22
    ./web/jsps/learning/viewtopic.jsp
Wednesday 03 Mar 2010
2:33 pm

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
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_tr_TR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  12. … 127 more files in changeset.
Friday 19 Feb 2010
12:25 pm

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -179
    • +179
    ./conf/language/lams/ApplicationResources.properties
    • -179
    • +179
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -179
    • +179
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -175
    • +175
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -180
    • +180
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -175
    • +175
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -178
    • +178
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -181
    • +181
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -196
    • +197
    ./conf/language/lams/ApplicationResources_tr_TR.properties
    • -174
    • +174
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  12. … 63 more files in changeset.
Wednesday 10 Feb 2010
9:00 am

Ernie Ghiglione

Updating Greek

Options
    • -180
    • +180
    ./conf/language/lams/ApplicationResources_el_GR.properties
Wednesday 03 Feb 2010
3:33 pm

jliew

LDEV-2502 merged from head

Options
    • -11
    • +13
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -1
    • +16
    ./src/java/org/lamsfoundation/lams/tool/forum/util/ConditionTopicComparator.java
2:50 pm

jliew

LDEV-2502 fix duplicate Messages appearing in Sets (namely, TextSearchCondition.topics)

Options
    • -11
    • +13
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -1
    • +16
    ./src/java/org/lamsfoundation/lams/tool/forum/util/ConditionTopicComparator.java
Tuesday 02 Feb 2010
8:20 am

Ernie Ghiglione

Updating Greek, German

Options
    • -38
    • +82
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -34
    • +34
    ./conf/language/lams/ApplicationResources_el_GR.properties
  3. … 4 more files in changeset.
Friday 29 Jan 2010
12:42 pm

Ernie Ghiglione

Updating Greek

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 6 more files in changeset.
Thursday 28 Jan 2010
10:54 am

Ernie Ghiglione

Updating Polish and Turkish

Options
    • -85
    • +86
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -151
    • +152
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  3. … 4 more files in changeset.
Sunday 03 Jan 2010
1:47 pm

Ernie Ghiglione

Updating Polish

Options
    • -67
    • +68
    ./conf/language/lams/ApplicationResources_pl_PL.properties
  2. … 3 more files in changeset.
Friday 20 Nov 2009
2:33 am

Ernie Ghiglione

Updating French

Options
    • -21
    • +21
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 13 more files in changeset.
Wednesday 18 Nov 2009
5:26 am

Ernie Ghiglione

Updating French

Options
    • -24
    • +24
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 8 more files in changeset.
Monday 16 Nov 2009
12:40 pm

Ernie Ghiglione

Updating French

Options
    • -50
    • +50
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 16 more files in changeset.