lams

lams_tool_dimdim

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 534
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
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
    • -1
    • +1
    ./conf/xdoclet/servlet-mappings.xml
    • -4
    • +0
    ./conf/xdoclet/taglibs.xml
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -53
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
  9. … 1089 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/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.
Tuesday 02 Feb 2010
1:05 am

Ernie Ghiglione

Adding Greek

Options
    • -0
    • +98
    ./conf/language/lams/ApplicationResources_el_GR.properties
1:05 am

Ernie Ghiglione

file ApplicationResources_el_GR.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 30 Jul 2009
10:58 pm

Andrey Balan

LDEV-2396 getting rid of config version

Options
    • -11
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java
    • -49
    • +22
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
    • -8
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
    • -6
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
    • -9
    • +10
    ./src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
    • -35
    • +11
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
    • -18
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
    • -22
    • +0
    ./web/pages/admin/edit.jsp
    • -4
    • +0
    ./web/pages/admin/view.jsp
Wednesday 29 Jul 2009
11:49 am

Andrey Balan

LDEV-2396 stopped checking the version in learning

Options
    • -10
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
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
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -5
    • +0
    ./web/common/simpleHeader.jsp
  4. … 95 more files in changeset.
Monday 27 Jul 2009
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
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
  2. … 49 more files 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
    • -35
    • +40
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
  2. … 85 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
    • -2
    • +6
    ./conf/xdoclet/web-settings.xml
  2. … 214 more files in changeset.
Wednesday 01 Jul 2009
4:16 pm

Marcin Cieslak

Added missing library and fixed classpaths - changes needed after code merge.

Options
    • -7
    • +6
    ./.classpath
  2. … 17 more files in changeset.
Tuesday 30 Jun 2009
5:04 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -7
    • +6
    ./.classpath
    • -2
    • +6
    ./conf/xdoclet/web-settings.xml
  3. … 56 more files in changeset.
Wednesday 13 May 2009
2:00 pm

Marcin Cieslak

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

Options
    • -7
    • +6
    ./.classpath
    • -2
    • +6
    ./conf/xdoclet/web-settings.xml
  3. … 9 more files in changeset.
Monday 06 Apr 2009
7:07 pm

Marcin Cieslak

LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.

Options
    • -1
    • +1
    ./build.xml
    • -0
    • +12
    ./conf/hibernate/mappings/hibernate.cfg.xml
    • -7
    • +0
    ./conf/hibernate/mappings/hibernate.properties
  4. … 55 more files in changeset.
Thursday 26 Mar 2009
11:00 am

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -1
    • +1
    ./conf/xdoclet/filters.xml
    • -10
    • +10
    ./conf/xdoclet/web-settings.xml
    • -5
    • +1
    ./db/sql/tool_insert.sql
    • -20
    • +6
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
  5. … 115 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
    • -2
    • +2
    ./conf/xdoclet/web-settings.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
    • -1
    • +1
    ./conf/xdoclet/filters.xml
    • -10
    • +10
    ./conf/xdoclet/web-settings.xml
    • -5
    • +1
    ./db/sql/tool_insert.sql
    • -20
    • +6
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
  5. … 77 more files in changeset.
Monday 16 Mar 2009
8:16 am

asukkar

Added repositoryService via spring

Removed calls to RepositoryProxy class.

LDEV-2171

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
  3. … 17 more files in changeset.
6:55 am

asukkar

Added repositoryService via spring

Removed calls to RepositoryProxy class.

LDEV-2171

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
  3. … 17 more files in changeset.
Thursday 26 Feb 2009
4:16 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • -3
    • +3
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 23 more files in changeset.
Friday 06 Feb 2009
3:36 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

Options
    • -1
    • +3
    ./web/WEB-INF/tags/FCKEditor.tag
  2. … 25 more files in changeset.
3:11 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

Options
    • -1
    • +1
    ./conf/xdoclet/servlets.xml
    • -1
    • +1
    ./web/WEB-INF/web.xml
    • -198
    • +112
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -11
    • +28
    ./web/WEB-INF/tags/FCKEditor.tag
  5. … 37 more files in changeset.
Tuesday 02 Dec 2008
4:22 am

asukkar

Perform trim on serverURL before saving to db.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
Friday 28 Nov 2008
6:02 am

asukkar

LDEV-2037

Modified enterprise to use same api as the standard version.

Options
    • -2
    • +1
    ./web/pages/admin/edit.jsp
5:45 am

asukkar

LDEV-2037

Modified enterprise to use same api as the standard version.

Options
    • -4
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +2
    ./db/sql/create_lams_tool_dimdim.sql
    • -25
    • +7
    ./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java
    • -111
    • +43
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
    • -29
    • +25
    ./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
    • -16
    • +5
    ./src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
    • -10
    • +4
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
    • -64
    • +27
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
    • -48
    • +10
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
    • -47
    • +15
    ./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
    • -33
    • +2
    ./web/pages/admin/edit.jsp
    • -10
    • +2
    ./web/pages/admin/view.jsp
Saturday 22 Nov 2008
11:41 pm

asukkar

LDEV-2048

Only show notebook entries when it is enabled.

Options
    • -33
    • +35
    ./web/pages/monitoring/summary.jsp