lams / lams_tool_gmap

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): 19,317
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: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
    • -0
    • +0
    ./WEB-INF/web.xml
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  3. … 24 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
    • -16
    • +16
    ./WEB-INF/web.xml
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -37
    • +37
    ./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
  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-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:25 am

jliew

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

Options
    • -5
    • +5
    ./common/learnerheader.jsp
    • -5
    • +5
    ./includes/jsp/mapFunctions.jsp
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -2
    • +2
    ./pages/export/exportPortfolio.jsp
    • -4
    • +4
    ./pages/monitoring/headItems.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  7. … 40 more files in changeset.
Friday 13 Nov 2009
4:13 am

jliew

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

Options
    • -5
    • +5
    ./common/learnerheader.jsp
    • -5
    • +5
    ./includes/jsp/mapFunctions.jsp
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -2
    • +2
    ./pages/export/exportPortfolio.jsp
    • -4
    • +4
    ./pages/monitoring/headItems.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  7. … 42 more files in changeset.
Wednesday 16 Sep 2009
8:47 am

Ernie Ghiglione

LDEV-2441: Check if the markers var exists if not then return an empty markersXML

Options
    • -0
    • +8
    ./includes/jsp/mapFunctions.jsp
8:46 am

Ernie Ghiglione

LDEV-2441: Check if the markers var exists if not then return an empty markersXML

Options
    • -0
    • +8
    ./includes/jsp/mapFunctions.jsp
8:43 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -10
    • +5
    ./pages/learning/notebook.jsp
    • -10
    • +5
    ./pages/learning/runOffline.jsp
    • -10
    • +10
    ./pages/learning/parts/finishButton.jsp
8:42 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -10
    • +5
    ./pages/learning/notebook.jsp
    • -10
    • +5
    ./pages/learning/runOffline.jsp
    • -10
    • +10
    ./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
    • -3
    • +0
    ./common/learnerheader.jsp
    • -3
    • +0
    ./pages/learning/notebook.jsp
    • -1
    • +0
    ./pages/monitoring/notebook.jsp
  6. … 93 more files in changeset.
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
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  2. … 214 more files in changeset.
Thursday 14 May 2009
2:30 am

lfoxton

LDEV-2335 Fixing up nullpointer problem when a gmap activity added in live edit is access in monitor and no sessions have been created yet.

Options
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  2. … 3 more files in changeset.
Wednesday 15 Apr 2009
6:25 am

lfoxton

Merging 2.3 changes with head

LDEV-2216 Changing handling of markerinfo and marker title to not use the javascript ecape() function as it was screwing up non ASCII (greek) characters

LDEV2232 setting gmap marker gmapSession to null on export content to prevent potential errors on import

Options
    • -3
    • +3
    ./common/learnerheader.jsp
    • -5
    • +31
    ./includes/jsp/mapFunctions.jsp
    • -1
    • +9
    ./pages/authoring/basic.jsp
    • -4
    • +4
    ./pages/export/exportPortfolio.jsp
    • -2
    • +2
    ./pages/monitoring/summary.jsp
  6. … 1 more file in changeset.
5:07 am

lfoxton

LDEV-2216 Changing handling of markerinfo and marker title to not use the javascript ecape() function as it was screwing up non ASCII (greek) characters

Options
    • -3
    • +3
    ./common/learnerheader.jsp
    • -5
    • +31
    ./includes/jsp/mapFunctions.jsp
    • -1
    • +9
    ./pages/authoring/basic.jsp
    • -4
    • +4
    ./pages/export/exportPortfolio.jsp
    • -2
    • +2
    ./pages/monitoring/summary.jsp
Thursday 26 Feb 2009
4:16 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • -2
    • +2
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 23 more files in changeset.
Monday 23 Feb 2009
6:05 am

Ernie Ghiglione

New gmap icon

Options
    • binary
    ./images/icon_gmap.swf
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.
3:11 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
    • -14
    • +14
    ./WEB-INF/tags/FCKEditor.tag
  4. … 38 more files in changeset.
Wednesday 04 Feb 2009
3:05 am

Ernie Ghiglione

LDEV-2113: Update FCKEditor.tag

Options
    • -1
    • +18
    ./WEB-INF/tags/FCKEditor.tag
  2. … 4 more files in changeset.
Friday 16 Jan 2009
5:36 am

lfoxton

fixing up some formatted files in gmap project

Options
    • -0
    • +0
    ./WEB-INF/web.xml
    • -2
    • +0
    ./pages/learning/gmap.jsp
  3. … 2 more files in changeset.
Friday 14 Nov 2008
7:49 am

lfoxton

LDEV-2014 - Changing the refresh button to not just to a location.reload but instead redirect to the learner/monitor page to prevent duplicate markers

Options
    • -7
    • +0
    ./includes/jsp/mapFunctions.jsp
    • -2
    • +9
    ./pages/learning/gmap.jsp
    • -3
    • +9
    ./pages/monitoring/summary.jsp
6:53 am

lfoxton

LDEV-2015 - Changing save button inside the marker to say "Place Marker" instead so it is not confused with the save button

Options
    • -1
    • +1
    ./includes/jsp/mapFunctions.jsp
  2. … 4 more files in changeset.
Wednesday 22 Oct 2008
4:35 am

lfoxton

LDEV-1850 - Fixing a problem that makes the GoogleMaps API check appear in the reflection page for monitoring and learning

Options
    • -3
    • +8
    ./WEB-INF/web.xml
    • -2
    • +2
    ./WEB-INF/struts/struts-config.xml
    • -9
    • +0
    ./WEB-INF/struts/tiles-defs.xml
    • -35
    • +63
    ./pages/learning/notebook.jsp
    • -16
    • +55
    ./pages/monitoring/notebook.jsp
  6. … 2 more files in changeset.
Monday 22 Sep 2008
7:29 am

jliew

LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).

Options
    • -5
    • +1
    ./WEB-INF/web.xml
  2. … 35 more files in changeset.
Thursday 18 Sep 2008
3:43 am

lfoxton

LDEV-1911 Making Gmap tool have its own config page for the gmap API key, istead of putting it in the general lams configuration page.

This is the web stuff to make the config model possible

Options
    • -0
    • +0
    ./WEB-INF/web.xml
    • -0
    • +19
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +14
    ./common/learnerheader.jsp
    • -17
    • +0
    ./includes/jsp/mapFunctions.jsp
    • -0
    • +61
    ./pages/admin/config.jsp
    • -0
    • +14
    ./pages/authoring/headItems.jsp
    • -0
    • +15
    ./pages/export/exportPortfolio.jsp
    • -1
    • +1
    ./pages/learning/gmap.jsp
    • -0
    • +14
    ./pages/monitoring/headItems.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
Monday 15 Sep 2008
6:22 am

lfoxton

Committing gmap icon

Also, deleting a trailing space in the activity title that was screwing up the centeredness of the gmap text on the tool activity icon

Options
    • binary
    ./images/icon_gmap.swf
  2. … 3 more files in changeset.
Thursday 31 Jul 2008
7:40 am

lfoxton

Small change to fix up geocoder address searcher

Options
    • -1
    • +1
    ./pages/authoring/basic.jsp