lams / lams_tool_larsrc

web

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): 20,266
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
Friday 05 Nov 2010
4:22 am

Marcin Cieslak

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

Options
    • -17
    • +27
    ./WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Sunday 24 Oct 2010
9:36 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Friday 22 Oct 2010
2:50 am

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-INF/tags/CKEditor.tag
  2. … 25 more files in changeset.
Sunday 10 Oct 2010
7: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
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
    • -8
    • +1
    ./WEB-INF/web.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -129
    • +0
    ./WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -2
    • +2
    ./WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    ./common/taglibs.jsp
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -5
    • +5
    ./pages/authoring/pedagogicalPlannerForm.jsp
  9. … 1089 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-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-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Wednesday 20 Jan 2010
11:47 pm

Andrey Balan

LDEV-2494 merge from HEAD to lams2_3_release branch

Options
    • -13
    • +6
    ./includes/javascript/rsrcresourceitem.js
11:44 pm

Andrey Balan

LDEV-2494 fixed Delete file action

Options
    • -13
    • +6
    ./includes/javascript/rsrcresourceitem.js
Friday 08 Jan 2010
8:37 am

jliew

LDEV-2482 merged from head

Options
    • -2
    • +2
    ./includes/javascript/rsrcresourceitem.js
8:36 am

jliew

LDEV-2482 change callback to post so utf8 doesn't mess up

Options
    • -2
    • +2
    ./includes/javascript/rsrcresourceitem.js
Wednesday 16 Sep 2009
9:59 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -2
    • +2
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/runoffline.jsp
  4. … 8 more files in changeset.
9:58 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -2
    • +2
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/runoffline.jsp
  4. … 8 more files in changeset.
Tuesday 18 Aug 2009
12:29 pm

lfoxton

LDEV-2421 Ability for teacher to sort resource items - author part done

Options
    • -0
    • +19
    ./pages/authoring/basic.jsp
    • -2
    • +130
    ./pages/authoring/parts/itemlist.jsp
  3. … 10 more files in changeset.
Monday 17 Aug 2009
12:39 pm

jliew

file addgoogledoc.jsp was initially added on branch lams2_3_oauth.

Options
    • -0
    • +0
    ./pages/authoring/parts/addgoogledoc.jsp
12:39 pm

jliew

oauth support functional but not production ready (tokens currently stored in address columns of lams_user). added new share resource type for google docs which are retrieved via oauth and saved as html files in content repository.

Options
    • -1
    • +3
    ./pages/authoring/basic.jsp
    • -0
    • +120
    ./pages/authoring/parts/addgoogledoc.jsp
    • -1
    • +25
    ./pages/authoring/parts/itemlist.jsp
  4. … 22 more files in changeset.
Tuesday 28 Jul 2009
10: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/fckeditorheader.jsp
    • -1
    • +0
    ./pages/authoring/authoring.jsp
    • -1
    • +0
    ./pages/authoring/definelater.jsp
  6. … 93 more files in changeset.
Thursday 02 Jul 2009
4:18 pm

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
    • +6
    ./WEB-INF/web.xml
    • -1
    • +1
    ./pages/authoring/parts/instructions.jsp
    • -5
    • +14
    ./pages/itemreview/instructionsnav.jsp
    • -3
    • +4
    ./pages/learning/addfile.jsp
    • -3
    • +2
    ./pages/learning/addurl.jsp
    • -4
    • +6
    ./pages/learning/learning.jsp
  7. … 209 more files in changeset.
Tuesday 30 Jun 2009
11:04 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -1
    • +6
    ./WEB-INF/web.xml
  2. … 57 more files in changeset.
Wednesday 13 May 2009
8:10 pm

Marcin Cieslak

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

Options
    • -1
    • +6
    ./WEB-INF/web.xml
  2. … 28 more files in changeset.
Thursday 07 May 2009
8:11 pm

mseaton

LDEV-2320 Added close function for author_sesson mode.

Options
    • -0
    • +2
    ./pages/itemreview/instructionsnav.jsp
Wednesday 06 May 2009
8:11 am

mseaton

LDEV-2277 Update resource learner page when a item is finished (even after user session completed/finished for tool).

Options
    • -15
    • +3
    ./pages/learning/learning.jsp
Tuesday 05 May 2009
10:44 am

mseaton

LDEV-2277 Update resource learner page when a item is finished (after session finished - ie reopen) and not locked on finish.

Options
    • -5
    • +19
    ./pages/learning/learning.jsp
  2. … 1 more file in changeset.
Thursday 30 Apr 2009
1:41 pm

mseaton

LDEV-2250 Fixed input type to html:text with property field (name value).

Options
    • -2
    • +2
    ./pages/learning/addfile.jsp
    • -2
    • +2
    ./pages/learning/addurl.jsp
Friday 24 Apr 2009
11:56 am

mseaton

LDEV-2250 Change text area to text (input) with maxlength 255 characters.

Options
    • -1
    • +1
    ./pages/authoring/parts/instructions.jsp
    • -3
    • +4
    ./pages/learning/addfile.jsp
    • -3
    • +2
    ./pages/learning/addurl.jsp
Wednesday 22 Apr 2009
3:46 pm

mseaton

LDEV-2241 Kept h2 tag to retain common position of text/button in instructions frame.

Options
    • -4
    • +7
    ./pages/itemreview/instructionsnav.jsp
Monday 20 Apr 2009
1:33 pm

mseaton

LDEV-2241 hide step heading when total not > 0

Options
    • -7
    • +11
    ./pages/itemreview/instructionsnav.jsp
Tuesday 14 Apr 2009
1:33 pm

dcarlier

LDEV-2186 Fixed->Adding instructions,deleting instructions, rearranging instructions and showing/hiding the loading icon when instructions are added/removed

Options
    • -2
    • +2
    ./includes/javascript/rsrccommon.js
    • -42
    • +20
    ./includes/javascript/rsrcresourceitem.js
    • -1
    • +1
    ./pages/authoring/parts/instructions.jsp
  4. … 1 more file in changeset.
12:56 pm

dcarlier

LDEV-2186 Fixed->Adding instructions,deleting instructions, rearranging instructions and showing/hiding the loading icon when instructions are added/removed

Options
    • -2
    • +2
    ./includes/javascript/rsrccommon.js
    • -42
    • +20
    ./includes/javascript/rsrcresourceitem.js
    • -1
    • +1
    ./pages/authoring/parts/instructions.jsp
  4. … 1 more file in changeset.
Wednesday 08 Apr 2009
2:45 pm

dcarlier

LDEV-2186 Arrow buttons to change order of instructions now working again

Options
    • -3
    • +3
    ./includes/javascript/rsrcresourceitem.js