lams / lams_tool_gmap / web / pages

authoring

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 6
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 368
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
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
    ./basic.jsp
  2. … 1096 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
    ./basic.jsp
  2. … 45 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
    ./basic.jsp
  2. … 47 more files in changeset.
Wednesday 15 Apr 2009
12:25 pm

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
    • -1
    • +9
    ./basic.jsp
  2. … 5 more files in changeset.
11: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
    • -1
    • +9
    ./basic.jsp
  2. … 4 more files in changeset.
Thursday 18 Sep 2008
9: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
    • +14
    ./headItems.jsp
  2. … 9 more files in changeset.
Thursday 31 Jul 2008
1:40 pm

lfoxton

Small change to fix up geocoder address searcher

Options
    • -1
    • +1
    ./basic.jsp
Tuesday 29 Jul 2008
2:17 pm

lfoxton

LDEV-1853 The default geocoder address is now saveable along with the other gmap content, so teachers can decide what info the students start with. This commit fixes the jsp pages to do so

Options
    • -1
    • +2
    ./basic.jsp
  2. … 5 more files in changeset.
2:04 pm

lfoxton

LDEV-1856 Resolved this issue by putting a javascript escape() around the title and info message when the markers are serialised for saving. Then when we redraw them later, the javascript unescape() function is used to put them back to their original form.

Options
    • -1
    • +1
    ./basic.jsp
  2. … 4 more files in changeset.
Wednesday 23 Jul 2008
12:15 pm

lfoxton

For LDEV-1850

Adding in reflection, finished for learner and author.

Monitor and export portfolio still unfinished

Options
    • -0
    • +32
    ./advanced.jsp
  2. … 22 more files in changeset.
Monday 14 Jul 2008
11:15 am

lfoxton

Some changes to ensure that maps display properly in IE 6 and IE 7

Options
    • -0
    • +2
    ./basic.jsp
  2. … 3 more files in changeset.
Wednesday 09 Jul 2008
8:25 am

lfoxton

LDEV-1845 adding a map legend to the map interface

Options
    • -4
    • +4
    ./basic.jsp
    • -2
    • +3
    ./headItems.jsp
  3. … 5 more files in changeset.
Monday 07 Jul 2008
12:51 pm

lfoxton

Fixing up map/sidebar divs using the float:left/right style

Options
    • -9
    • +8
    ./basic.jsp
12:39 pm

lfoxton

Added onkeypress (enter) evecnt catches to prevent the form from submitting when someone presses enter either editing a marker or using the geocoder

Options
    • -4
    • +4
    ./basic.jsp
  2. … 3 more files in changeset.
Friday 04 Jul 2008
12:28 pm

lfoxton

Fixed up a problem with export/import tool content that was throwing an error when the user saves an imported gmap

Options
    • -1
    • +1
    ./basic.jsp
  2. … 3 more files in changeset.
11:21 am

lfoxton

Removing the test button from the author interface

Options
    • -1
    • +0
    ./basic.jsp
10:36 am

lfoxton

Added changes in to implement code and interfaces for grouping, this was previously un-implemented n monitor and learner

Options
    • -2
    • +2
    ./basic.jsp
    • -8
    • +7
    ./headItems.jsp
  3. … 34 more files in changeset.
Tuesday 01 Jul 2008
9:22 am

lfoxton

Optimising the author javascript

Options
    • -31
    • +38
    ./basic.jsp
    • -11
    • +0
    ./headItems.jsp
Thursday 26 Jun 2008
8:21 am

lfoxton

learner and monitor draft versions are done

Options
    • -2
    • +6
    ./basic.jsp
    • -0
    • +1
    ./headItems.jsp
  3. … 14 more files in changeset.
Friday 06 Jun 2008
8:24 am

lfoxton

Authoring is working, you can submit new markers and they will appear again when you go back to them.

Options
    • -34
    • +34
    ./basic.jsp
    • -7
    • +20
    ./headItems.jsp
  3. … 41 more files in changeset.
Wednesday 04 Jun 2008
1:54 pm

lfoxton

Advanced options implemented in learner, some fixes to hte display of the info maessages for the markers,

created by user is also displayed

Options
    • -1
    • +2
    ./basic.jsp
    • -0
    • +1
    ./headItems.jsp
  3. … 16 more files in changeset.
Tuesday 03 Jun 2008
11:53 am

lfoxton

- Updated advanced tab

- Learner now displays gmap and markers

- Some map control advanced options implemented in learner

- build script updated to allow to deploy just the jar file

Options
    • -0
    • +11
    ./advanced.jsp
    • -5
    • +5
    ./authoring.jsp
    • -34
    • +25
    ./basic.jsp
    • -2
    • +4
    ./headItems.jsp
  5. … 9 more files in changeset.
Monday 02 Jun 2008
3:51 pm

lfoxton

- Added options in advanced tab, as well as persistance entries in the Gmap object

- Add state-saving for the Gmap, so when the teacher saves teh map, it appears exactly as it was before when they go back, ie map type, zoom, location

- Fixed up language strings in application.properties

- All non-cosmetic authoring tasks so far are completed

Options
    • -4
    • +80
    ./advanced.jsp
    • -2
    • +5
    ./authoring.jsp
    • -12
    • +15
    ./basic.jsp
    • -0
    • +3
    ./headItems.jsp
  5. … 14 more files in changeset.
9:08 am

lfoxton

Added title field to the marker object

added sidebar to the view

Options
    • -5
    • +21
    ./basic.jsp
    • -3
    • +1
    ./headItems.jsp
    • -10
    • +0
    ./map.jsp
  4. … 8 more files in changeset.
Friday 30 May 2008
11:42 am

lfoxton

Code for google map tool

Now can save markers in authoring, they are redisplayed on the map

Options
    • -7
    • +16
    ./authoring.jsp
    • -2
    • +44
    ./basic.jsp
    • -0
    • +7
    ./headItems.jsp
  4. … 22 more files in changeset.
Friday 23 May 2008
2:29 pm

lfoxton

First commit for the gmap tool

Got the gmaps appearing in author, you can add multiple markers and descriptions for the markers, but you cannot save yet.

Draft data model also completed

Options
    • -0
    • +20
    ./advanced.jsp
    • -0
    • +71
    ./authoring.jsp
    • -0
    • +32
    ./basic.jsp
    • -0
    • +14
    ./headItems.jsp
    • -0
    • +207
    ./instructions.jsp
    • -0
    • +10
    ./map.jsp
  7. … 138 more files in changeset.