lams / lams_tool_wiki

web

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 10
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 19,949
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:46 pm

Marcin Cieslak

LDEV-2577: Workaround for Firefox limitation of inserting malicious HTML.

Options
    • -1
    • +7
    ./wikilink/wikilink.js
Monday 18 Oct 2010
10:51 pm

Marcin Cieslak

LDEV-2577: Rewrote WikiLink for new CKEditor.

For Firefox 3.6.10 inserting HTML is not working:

https://bugzilla.mozilla.org/show_bug.cgi?id=596300

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

https://bugzilla.mozilla.org/show_bug.cgi?id=597784

Maybe future releases of FF will allow to insert any content into editor area.

Options
    • -131
    • +0
    ./wikilink/fck_wikilink.jsp
    • -19
    • +0
    ./wikilink/fckplugin.js
    • -0
    • +34
    ./wikilink/plugin.js
    • -0
    • +91
    ./wikilink/wikilink.js
    • -0
    • +55
    ./wikilink/wikilink.jsp
    • -7
    • +13
    ./wikilink/lang/en.js
  7. … 2 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
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -30
    • +30
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -1
    • +0
    ./common/taglibs.jsp
    • -2
    • +3
    ./includes/javascript/wikiCommon.js
    • -1
    • +1
    ./pages/authoring/advanced.jsp
    • -19
    • +19
    ./pages/authoring/basic.jsp
    • -6
    • +6
    ./pages/authoring/pedagogicalPlannerForm.jsp
    • -14
    • +19
    ./pages/learning/wiki.jsp
    • -9
    • +9
    ./pages/monitoring/wikiDisplay.jsp
  13. … 1085 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-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.
Monday 16 Nov 2009
3:26 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp
3:25 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/advanced.jsp
    • -10
    • +10
    ./pages/authoring/basic.jsp
    • -11
    • +11
    ./pages/learning/wiki.jsp
    • -11
    • +11
    ./pages/monitoring/wikiDisplay.jsp
  5. … 42 more files in changeset.
Friday 13 Nov 2009
4:13 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/advanced.jsp
    • -9
    • +9
    ./pages/authoring/basic.jsp
    • -11
    • +11
    ./pages/learning/wiki.jsp
    • -11
    • +11
    ./pages/monitoring/wikiDisplay.jsp
  5. … 44 more files in changeset.
Wednesday 16 Sep 2009
6:39 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/runOffline.jsp
    • -2
    • +6
    ./pages/learning/parts/finishButton.jsp
6:38 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/runOffline.jsp
    • -2
    • +6
    ./pages/learning/parts/finishButton.jsp
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-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
    • -5
    • +0
    ./common/learnerheader.jsp
    • -1
    • +0
    ./pages/monitoring/headItems.jsp
  5. … 94 more files in changeset.
Tuesday 14 Jul 2009
6:56 am

lfoxton

LDEV-2372 Adding more tests to the wiki tool

Options
    • -2
    • +6
    ./WEB-INF/web.xml
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
    • -4
    • +0
    ./pages/wiki/compare.jsp
    • -5
    • +1
    ./pages/wiki/viewWiki.jsp
  3. … 213 more files in changeset.
Tuesday 05 May 2009
3:36 am

mseaton

LDEV-2264 wiki compare/view pages - removed help icon.

Options
    • -5
    • +0
    ./pages/wiki/compare.jsp
    • -6
    • +1
    ./pages/wiki/viewWiki.jsp
3:32 am

mseaton

LDEV-2264 wiki compare/view pages - removed header (logo) and added help icon.

Options
    • -4
    • +5
    ./pages/wiki/compare.jsp
    • -4
    • +5
    ./pages/wiki/viewWiki.jsp
Monday 20 Apr 2009
8:04 am

ruslan

LDEV-2225: Wiki monitor page now using appropriate CSS

Options
    • -1
    • +1
    ./layouts/defaultLayout.jsp
8:00 am

ruslan

LDEV-2225: Wiki monitor page now using appropriate CSS

Options
    • -1
    • +1
    ./layouts/defaultLayout.jsp
2:51 am

lfoxton

Merging wiki greek characters fix with head

Options
    • -2
    • +2
    ./includes/javascript/wikiCommon.js
2:49 am

lfoxton

LDEV-2055 Fixing non-unique result problem reproduced by Spyros, this was happening from a sequence that WikiPage titles with "/n" characters in them, possibly due to copy/pasting the titles in

Options
    • -2
    • +2
    ./includes/javascript/wikiCommon.js
2:11 am

lfoxton

Merging wiki greek characters fix with head

Options
    • -2
    • +1
    ./login.jsp
    • -2
    • +2
    ./WEB-INF/web.xml
    • -1
    • +5
    ./includes/javascript/wikiCommon.js
  4. … 6 more files in changeset.
Friday 17 Apr 2009
7:31 am

lfoxton

LDEV-2055 Fixing non-unique result problem reproduced by Spyros, this was happening from a sequence that WikiPage titles with "/n" characters in them, possibly due to copy/pasting the titles in

Options
    • -2
    • +1
    ./login.jsp
    • -2
    • +2
    ./WEB-INF/web.xml
    • -1
    • +5
    ./includes/javascript/wikiCommon.js
  4. … 6 more files in changeset.
Thursday 26 Mar 2009
11:00 am

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -11
    • +11
    ./WEB-INF/web.xml
    • -0
    • +19
    ./WEB-INF/struts/struts-config.xml
  3. … 117 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
    • -10
    • +10
    ./WEB-INF/web.xml
    • -0
    • +19
    ./WEB-INF/struts/struts-config.xml
  3. … 79 more files in changeset.
Sunday 01 Mar 2009
9:51 am

Ernie Ghiglione

LDEV-2152: includes next activity icon - fixing error: by mistake added the nextActivity span tag to Continue. Removed now

Options
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
3:53 am

Ernie Ghiglione

LDEV-2152: includes next activity icon

Options
    • -4
    • +8
    ./pages/learning/notebook.jsp
    • -5
    • +8
    ./pages/learning/runOffline.jsp
    • -12
    • +3
    ./pages/learning/parts/finishButton.jsp
  4. … 5 more files in changeset.
Thursday 26 Feb 2009
4:26 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • -3
    • +3
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 1 more file in changeset.
Monday 23 Feb 2009
9:33 pm

Marcin Cieslak

LDEV-1998: Adjusted layout of tools' PedPlanner form contents.

Options
    • -1
    • +1
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 13 more files in changeset.
Friday 20 Feb 2009
4:04 am

Ernie Ghiglione

LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

Options
    • -0
    • +1
    ./WEB-INF/tags/FCKEditor.tag
  2. … 21 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-INF/tags/FCKEditor.tag
  2. … 25 more files in changeset.