lams / lams_tool_pixlr

web

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 9
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 17,588
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 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
    • -2
    • +2
    ./WEB-INF/lams.tld
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -33
    • +33
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./common/taglibs.jsp
    • -2
    • +2
    ./pages/authoring/basic.jsp
  8. … 1090 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.
Monday 16 Nov 2009
10:25 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -2
    • +2
    ./pages/export/exportPortfolio.jsp
    • -2
    • +2
    ./pages/learning/pixlr.jsp
    • -1
    • +1
    ./pages/learning/viewAll.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  6. … 41 more files in changeset.
Friday 13 Nov 2009
11:13 am

jliew

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

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -2
    • +2
    ./pages/export/exportPortfolio.jsp
    • -2
    • +2
    ./pages/learning/pixlr.jsp
    • -1
    • +1
    ./pages/learning/viewAll.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  6. … 43 more files in changeset.
Wednesday 16 Sep 2009
4:01 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/viewAll.jsp
4:01 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/viewAll.jsp
9:40 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
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
9: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
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
Monday 31 Aug 2009
12:59 pm

jliew

LDEV-2431 fix typo in form name

Options
    • -1
    • +1
    ./pages/admin/config.jsp
  2. … 1 more file in changeset.
10:44 am

jliew

LDEV-2431 fix typo in form name

Options
    • -1
    • +1
    ./pages/admin/config.jsp
  2. … 1 more file 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
    • -4
    • +0
    ./common/learnerheader.jsp
    • -4
    • +0
    ./pages/learning/notebook.jsp
    • -1
    • +0
    ./pages/monitoring/notebook.jsp
  6. … 93 more files in changeset.
Friday 24 Apr 2009
3:24 pm

Ernie Ghiglione

LDEV-2152: fix issues with next activity button for pixlr

Options
    • -1
    • +1
    ./pages/learning/viewAll.jsp
    • -2
    • +2
    ./pages/learning/parts/finishButton.jsp
9:49 am

lfoxton

LDEV-2172 Fixing pixlr deployment to create the pixlr directory

Options
    • binary
    ./images/blank.jpg
  2. … 1 more file in changeset.
Tuesday 21 Apr 2009
9:36 am

mseaton

LDEV-2236 Removed unused css.

Options
    • -1
    • +0
    ./common/learnerheader.jsp
9:36 am

mseaton

LDEV-2236 Removed additional styleId reference.

Options
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
Sunday 01 Mar 2009
9:51 am

Ernie Ghiglione

LDEV-2152: includes next activity icon

Options
    • -5
    • +9
    ./pages/learning/notebook.jsp
    • -4
    • +8
    ./pages/learning/runOffline.jsp
    • -4
    • +8
    ./pages/learning/viewAll.jsp
    • -4
    • +8
    ./pages/learning/parts/finishButton.jsp
  5. … 8 more files in changeset.
Thursday 26 Feb 2009
1:27 pm

Ernie Ghiglione

Adding SVG pixlr logo

Options
    • binary
    ./images/pixlr_logo.svg.zip
11:16 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • -3
    • +3
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 23 more files in changeset.
7:32 am

Ernie Ghiglione

LDEV-2004: Changing pixlr logo

Options
    • binary
    ./images/icon_pixlr.swf
Friday 20 Feb 2009
12:31 pm

Ernie Ghiglione

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

Options
    • -0
    • +1
    ./WEB-INF/tags/FCKEditor.tag
Friday 06 Feb 2009
10: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.
10:21 am

mseaton

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

Options
    • -1
    • +1
    ./WEB-INF/web.xml
    • -198
    • +112
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -11
    • +28
    ./WEB-INF/tags/FCKEditor.tag
  4. … 42 more files in changeset.
Wednesday 14 Jan 2009
11:15 am

lfoxton

LDEV-2081 Adding dialog in learner that tells the user to click file/save to return to learner, the dialog appears just before the pixlr popup loads

Options
    • -0
    • +2
    ./pages/learning/pixlr.jsp
  2. … 1 more file in changeset.
Monday 12 Jan 2009
11:15 am

lfoxton

LDEV-2079 use the same language as users in pixlr

added an admin page with a tet field that has all the currently supported languages in a comma-seperated string which can be updated by system admins if there are new languages added to pixlr that we are unaware of

Options
    • -0
    • +0
    ./WEB-INF/web.xml
    • -0
    • +19
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +61
    ./pages/admin/config.jsp
  4. … 15 more files in changeset.
Friday 09 Jan 2009
6:32 am

lfoxton

pixlr - fixing a bug in learner where image wouldnt resize to fit the scree because it took too long to load. Moving the javasctipt to the onload method fixed the problem

Options
    • -1
    • +1
    ./WEB-INF/web.xml
    • -0
    • +1
    ./common/learnerheader.jsp
    • -0
    • +39
    ./includes/javascript/learning.js
    • -1
    • +1
    ./layouts/learningLayout.jsp
    • -40
    • +5
    ./pages/learning/pixlr.jsp
Thursday 08 Jan 2009
10:39 am

lfoxton

fixing pixlr tool so blank image is always tested against default content, in case the default content is changed by the user and is no longer the blank.jpg file

Options
    • -3
    • +9
    ./pages/learning/pixlr.jsp
  2. … 3 more files in changeset.
6:48 am

lfoxton

adding reflection to pixlr learner export portfolio

Options
    • -0
    • +21
    ./pages/export/exportPortfolio.jsp