Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 1 more file in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 more files in changeset.
New gmap icon

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

  1. … 21 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

  1. … 25 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

    • -200
    • +114
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
  1. … 83 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 21 more files in changeset.
fixing up some formatted files in gmap project

  1. … 2 more files in changeset.
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

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

  1. … 4 more files in changeset.
LDEV-1850 - Fixing a problem that makes the GoogleMaps API check appear in the reflection page for monitoring and learning

  1. … 2 more files in changeset.
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).

  1. … 35 more files in changeset.
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

    • -0
    • +61
    ./pages/admin/config.jsp
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

  1. … 3 more files in changeset.
Small change to fix up geocoder address searcher

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

  1. … 2 more files in changeset.
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.

LDEV-1850 - Adding reflection to advanced summary in monitor for gmap

  1. … 2 more files in changeset.
LDEV-1850 - Doing reflection for Gmap, export portfolio

  1. … 1 more file in changeset.
LDEV-1850 - Doing reflection for Gmap, Learner, monitor done. Just need to do export portfolio

    • -0
    • +19
    ./pages/monitoring/notebook.jsp
  1. … 7 more files in changeset.
LDEV-1662 wrong closure of the script tab solved in all tools

  1. … 11 more files in changeset.
For LDEV-1850

Adding in reflection, finished for learner and author.

Monitor and export portfolio still unfinished

    • -0
    • +38
    ./pages/learning/notebook.jsp
    • -0
    • +73
    ./pages/learning/parts/finishButton.jsp
  1. … 14 more files in changeset.
For LDEV-1851

Adding the saveMarkers action to monitor so the teacher can save/update/remove markers

  1. … 3 more files in changeset.
Fixing up refresh function so it also warns when a marker has been edited

Moving the common editMarker method to the map mapFunctions library

Added refresh button to monitor and learner interfaces

  1. … 2 more files in changeset.
Added in functionality that preserves the open user div when a new maker is added to the list. and the sidebar is subsequently refreshed

also added in some commenting.

LDEV-1852 - Edit a marker produces a copy of it, if you move the marker first. A simple fix

Some small GMAP language changes

  1. … 2 more files in changeset.
LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

Gmap

  1. … 1 more file in changeset.