Fisheye on lams/lams_tool_gmap/web/common

lams (MAIN): LDEV-4067: changing google maps URL to be on https rather than http

Ernie Ghiglione — Sun, 20 Nov 2016 15:44:38 +0100

Ernie Ghiglione committed MAIN:ernieg:20161120144438 on branch MAIN in lams

LDEV-4067: changing google maps URL to be on https rather than http

· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4067: changing google maps URL to be on https rather than http

Ernie Ghiglione — Sun, 20 Nov 2016 15:43:06 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20161120144306 on branch lams2_head_wildfly in lams

LDEV-4067: changing google maps URL to be on https rather than http

· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3792: Bootstrapping GMap Author

fionam — Thu, 12 May 2016 04:48:43 +0200

fionam committed lams2_head_wildfly:fionam:20160512024843 on branch lams2_head_wildfly in lams

LDEV-3792: Bootstrapping GMap Author

· /lams_tool_gmap/web/WEB-INF/tiles-defs.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag

(-0, +53)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Arrow.tag

(-0, +35)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag

(-6, +6)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag

(-4, +12)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Comments.tag

(-0, +47)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag

(-0, +51)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/ImgButtonWrapper.tag

(-37, +37)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Page.tag

(-7, +20)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-0, +54)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TSTable.tag

(-0, +53)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Tab.tag

(-12, +16)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TabBody.tag

(-14, +6)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TabBodyArea.tag

(-0, +39)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TabBodys.tag

(-0, +37)

| History

| Source

| Diff

… 9 more files in changeset.

lams (lams2_head_wildfly): LDEV-3699: Update Gmap Learner to Bootstrap

fionam — Mon, 29 Feb 2016 04:11:42 +0100

fionam committed lams2_head_wildfly:fionam:20160229031142 on branch lams2_head_wildfly in lams

LDEV-3699: Update Gmap Learner to Bootstrap

· /lams_tool_gmap/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(-7, +15)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/mapLegend.jsp	(-0, +29)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/defineLater.jsp	(-7, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-38, +36)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-9, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-35, +38)	\| History	\| Source	\| Diff

lams (MAIN): file definelaterheader.jsp was initially added on branch lams2_head_wildfly.

fionam — Mon, 29 Feb 2016 04:09:43 +0100

fionam committed MAIN:fionam:20160229030943 on branch MAIN in lams

file definelaterheader.jsp was initially added on branch lams2_head_wildfly.

· /lams_tool_gmap/web/common/definelaterheader.jsp

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-3700: Define Later window now displayed as it doesn't check for the Google maps key (which won't be present when th...

fionam — Mon, 29 Feb 2016 04:09:32 +0100

fionam committed lams2_head_wildfly:fionam:20160229030932 on branch lams2_head_wildfly in lams

LDEV-3700: Define Later window now displayed as it doesn't check for the Google maps key (which won't be present when the teacher is editing!)

· /lams_tool_gmap/web/WEB-INF/tiles-defs.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/definelaterheader.jsp	(-0, +16)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2463: escape HTML to prevent possible XSS attacks

Ernie Ghiglione — Thu, 27 Mar 2014 19:22:21 +0100

Ernie Ghiglione committed MAIN:ernieg:20140327182221 on branch MAIN in lams

LDEV-2463: escape HTML to prevent possible XSS attacks

· /lams_tool_gmap/web/common/learnerheader.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-12, +11)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/editActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/notebook.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-4, +4)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3084: If Google Maps API was not loaded, mark browser as incompatible, resulting in "Could not load map" message, b...

Marcin Cieslak — Wed, 31 Jul 2013 13:47:39 +0200

Marcin Cieslak committed MAIN:marcin:20130731114739 on branch MAIN in lams

LDEV-3084: If Google Maps API was not loaded, mark browser as incompatible, resulting in "Could not load map" message, better than error while loading page.

· /lams_tool_gmap/web/common/learnerheader.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-0, +1)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2817: Remove references to nonexistent css files in tools

Ernie Ghiglione — Tue, 13 Nov 2012 04:26:07 +0100

Ernie Ghiglione committed MAIN:ernieg:20121113032607 on branch MAIN in lams

LDEV-2817: Remove references to nonexistent css files in tools

· /lams_tool_bbb/web/common/simpleHeader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_bbb/web/common/tabbedHeader.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/learning/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/monitoring/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/authoring/addCondition.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/pages/learning/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/pages/learning/viewAll.jsp

(-1, +0)

| History

| Source

| Diff

… 4 more files in changeset.

lams (MAIN): LDEV-2577...

Marcin Cieslak — Wed, 06 Oct 2010 12:09:17 +0200

Marcin Cieslak committed MAIN:marcin:20101006100917 on branch MAIN in lams

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

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.

· /lams_admin/conf/xdoclet/servlet-mappings.xml

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/taglibs.xml

(-8, +0)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-16, +5)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/lams.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld

(-129, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/CKEditor.tag

(-0, +54)

| History

| Source

· /lams_admin/web/WEB-INF/tags/FCKEditor.tag

(-54, +0)

| History

| Source

| Diff

· /lams_build/3rdParty.userlibraries

(-1, +1)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-1, +1)

| History

| Source

| Diff

· /lams_build/lib/fckeditor/FCKeditor-2.4.1.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar

(binary)

| History

| Source

· /lams_central/build.xml

(-2, +2)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/filter-mappings.xml

(-3, +3)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/taglib-tag.xml

(-2, +2)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/taglibs.xml

(-4, +0)

| History

| Source

| Diff

… 1082 more files in changeset.

lams (lams2_3_release): LDEV-2459 LDEV-2462 surround i18n messages with double quotes when outputting to html or javascript

jliew — Mon, 16 Nov 2009 03:25:01 +0100

jliew committed lams2_3_release:jliew:20091116022501 on branch lams2_3_release in lams

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

· /lams_admin/web/ldap.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/userlist.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userorg.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-9, +9)

| History

| Source

| Diff

· /lams_central/web/forgotPassword.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/forgotPasswordChange.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseLearner.jsp

(-19, +19)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseMonitor.jsp

(-12, +12)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitor.jsp

(-36, +36)

| History

| Source

| Diff

· /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp

(-12, +12)

| History

| Source

| Diff

· /lams_monitoring/web/errorbox.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/basic.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/export/parts/exportlearner.jsp

(-4, +4)

| History

| Source

| Diff

… 31 more files in changeset.

lams (MAIN): LDEV-2459 use double quotes when enclosing i18n text in javascript

jliew — Fri, 13 Nov 2009 04:13:45 +0100

jliew committed MAIN:jliew:20091113031345 on branch MAIN in lams

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

· /lams_admin/web/ldap.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_admin/web/userlist.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userorg.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-9, +9)

| History

| Source

| Diff

· /lams_central/web/forgotPassword.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/forgotPasswordChange.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/tutorialVideo.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseLearner.jsp

(-19, +19)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseMonitor.jsp

(-12, +12)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitor.jsp

(-36, +36)

| History

| Source

| Diff

· /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp

(-12, +12)

| History

| Source

| Diff

· /lams_monitoring/web/errorbox.jsp

(-1, +1)

| History

| Source

| Diff

… 33 more files in changeset.

lams (MAIN): LDEV-2387 simplified rendering of FCKEditor...

Andrey Balan — Tue, 28 Jul 2009 16:19:45 +0200

Andrey Balan committed MAIN:andreyb:20090728141945 on branch MAIN in lams

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

· /lams_admin/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/common/fckeditorheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/authoring.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/definelater.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/headItems.tag

(binary)

| History

| Source

| Diff

… 83 more files in changeset.

lams (MAIN): Merging 2.3 changes with head...

lfoxton — Wed, 15 Apr 2009 06:25:52 +0200

lfoxton committed MAIN:lfoxton:20090415042552 on branch MAIN in lams

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

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(-1, +11)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/learnerheader.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-5, +31)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams (lams2_3): LDEV-2216 Changing handling of markerinfo and marker title to not use the javascript ecape() function as it was screwing...

lfoxton — Wed, 15 Apr 2009 05:07:26 +0200

lfoxton committed lams2_3:lfoxton:20090415030726 on branch lams2_3 in lams

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

· /lams_tool_gmap/web/common/learnerheader.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-5, +31)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-2, +2)	\| History	\| Source	\| Diff

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

lfoxton — Thu, 18 Sep 2008 03:43:10 +0200

lfoxton committed MAIN:lfoxton:20080918014310 on branch MAIN in lams

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

· /lams_tool_gmap/web/WEB-INF/web.xml	(-0, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	(-0, +19)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/learnerheader.jsp	(-0, +14)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-17, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/admin/config.jsp	(-0, +61)	\| History	\| Source
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-0, +14)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-0, +15)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-0, +14)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-1856 Resolved this issue by putting a javascript escape() around the title and info message when the markers are se...

lfoxton — Tue, 29 Jul 2008 08:04:16 +0200

lfoxton committed MAIN:lfoxton:20080729060416 on branch MAIN in lams

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.

· /lams_tool_gmap/web/common/learnerheader.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-2, +5)	\| History	\| Source	\| Diff

lams (MAIN): For LDEV-1851...

lfoxton — Tue, 22 Jul 2008 04:36:37 +0200

lfoxton committed MAIN:lfoxton:20080722023637 on branch MAIN in lams

For LDEV-1851

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

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(-3, +15)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(-1, +73)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java	(-2, +22)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-8, +14)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-59, +77)	\| History	\| Source	\| Diff

lams (MAIN): Removing some unneccessary resizing javascript methods from the learner interface

lfoxton — Mon, 14 Jul 2008 06:05:24 +0200

lfoxton committed MAIN:lfoxton:20080714040524 on branch MAIN in lams

Removing some unneccessary resizing javascript methods from the learner interface

· /lams_tool_gmap/web/common/learnerheader.jsp

(-44, +0)

| History

| Source

| Diff

lams (MAIN): Fixed up some small learner alert bugs

lfoxton — Mon, 14 Jul 2008 05:37:35 +0200

lfoxton committed MAIN:lfoxton:20080714033735 on branch MAIN in lams

Fixed up some small learner alert bugs

· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(-2, +0)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-1845 adding a map legend to the map interface

lfoxton — Wed, 09 Jul 2008 02:25:55 +0200

lfoxton committed MAIN:lfoxton:20080709002555 on branch MAIN in lams

LDEV-1845 adding a map legend to the map interface

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-1, +6)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/mapLegend.jsp	(-0, +24)	\| History	\| Source
· /lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-2, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-1, +2)	\| History	\| Source	\| Diff

lams (MAIN): Fixing up learner interface to resize the map when the window is resized

lfoxton — Tue, 08 Jul 2008 01:50:55 +0200

lfoxton committed MAIN:lfoxton:20080707235055 on branch MAIN in lams

Fixing up learner interface to resize the map when the window is resized

· /lams_tool_gmap/web/common/learnerheader.jsp

(-1, +49)

| History

| Source

| Diff

lams (MAIN): Added changes in to implement code and interfaces for grouping, this was previously un-implemented n monitor and learner...

lfoxton — Fri, 04 Jul 2008 04:36:02 +0200

lfoxton committed MAIN:lfoxton:20080704023602 on branch MAIN in lams

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

· /lams_tool_gmap/.classpath

(-0, +3)

| History

| Source

| Diff

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml

(-0, +10)

| History

| Source

| Diff

· /lams_tool_gmap/conf/language/ApplicationResources.properties

(-31, +49)

| History

| Source

| Diff

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties

(-29, +15)

| History

| Source

| Diff

· /lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties

(-28, +44)

| History

| Source

| Diff

· /lams_tool_gmap/conf/language/rams/ApplicationResources.properties

(-38, +53)

| History

| Source

| Diff

· /lams_tool_gmap/conf/language/rams/ApplicationResources_en_AU.properties

(-38, +53)

| History

| Source

| Diff

· /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql

(-2, +3)

| History

| Source

| Diff

· /lams_tool_gmap/db/sql/table-schema.sql

(-1, +3)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java

(-2, +3)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java

(-1, +8)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java

(-14, +11)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java

(-4, +12)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java

(-2, +25)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java

(-1, +21)

| History

| Source

| Diff

… 21 more files in changeset.

lams (MAIN): Optimisting leanerHeader.jsp to use jstl tags better

lfoxton — Tue, 01 Jul 2008 03:20:36 +0200

lfoxton committed MAIN:lfoxton:20080701012036 on branch MAIN in lams

Optimisting leanerHeader.jsp to use jstl tags better

· /lams_tool_gmap/web/common/learnerheader.jsp	(-49, +20)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/layouts/learningLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (MAIN): learner and monitor draft versions are done

lfoxton — Thu, 26 Jun 2008 02:21:06 +0200

lfoxton committed MAIN:lfoxton:20080626002106 on branch MAIN in lams

learner and monitor draft versions are done

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(-8, +5)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/web.xml	(-0, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/learnerheader.jsp	(-15, +13)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/images/collapse.gif	(binary)	\| History	\| Source
· /lams_tool_gmap/web/images/expand.gif	(binary)	\| History	\| Source
· /lams_tool_gmap/web/includes/javascript/mapFunctions.js	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js	(-0, +0)	\| History	\| Source
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-3, +17)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-2, +6)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-10, +17)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-2, +157)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-1, +46)	\| History	\| Source	\| Diff

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

lfoxton — Fri, 06 Jun 2008 02:24:18 +0200

lfoxton committed MAIN:lfoxton:20080606002418 on branch MAIN in lams

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

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties

(-3, +9)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java

(-2, +3)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java

(-0, +24)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java

(-3, +4)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java

(-0, +24)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java

(-2, +2)

| History

| Source

| Diff

… 28 more files in changeset.

lams (MAIN): Advanced options implemented in learner, some fixes to hte display of the info maessages for the markers,...

lfoxton — Wed, 04 Jun 2008 07:54:41 +0200

lfoxton committed MAIN:lfoxton:20080604055441 on branch MAIN in lams

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

created by user is also displayed

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml

(-0, +22)

| History

| Source

| Diff

· /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql

(-2, +4)

| History

| Source

| Diff

· /lams_tool_gmap/db/sql/table-schema.sql

(-1, +5)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java

(-7, +11)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java

(-0, +110)

| History

| Source

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java

(-54, +46)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java

(-1, +3)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java

(-15, +47)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java

(-16, +14)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/web.xml

(-0, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag

(-3, +6)

| History

| Source

| Diff

· /lams_tool_gmap/web/common/learnerheader.jsp

(-12, +24)

| History

| Source

| Diff

· /lams_tool_gmap/web/includes/javascript/authoring.js

(-0, +1)

| History

| Source

| Diff

· /lams_tool_gmap/web/includes/javascript/mapFunctions.js

(-210, +53)

| History

| Source

| Diff

· /lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js

(-0, +114)

| History

| Source

… 3 more files in changeset.

lams (MAIN): - Updated advanced tab...

lfoxton — Tue, 03 Jun 2008 05:53:16 +0200

lfoxton committed MAIN:lfoxton:20080603035316 on branch MAIN in lams

- 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

· /lams_tool_gmap/build.xml	(-0, +19)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(-2, +149)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(-11, +13)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(-4, +6)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/learnerheader.jsp	(-0, +59)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/authoring.js	(-3, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/javascript/mapFunctions.js	(-35, +10)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/layouts/learningLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/advanced.jsp	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/authoring.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-34, +25)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-2, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-15, +32)	\| History	\| Source	\| Diff

lams (MAIN): First commit for the gmap tool...

lfoxton — Fri, 23 May 2008 08:29:09 +0200

lfoxton committed MAIN:lfoxton:20080523062909 on branch MAIN in lams

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

· /lams_tool_gmap/.classpath

(-0, +12)

| History

| Source

· /lams_tool_gmap/.cvsignore

(-0, +4)

| History

| Source

· /lams_tool_gmap/.myumldata

(-0, +2)

| History

| Source

· /lams_tool_gmap/.project

(-0, +17)

| History

| Source

· /lams_tool_gmap/build.properties

(-0, +20)

| History

| Source

· /lams_tool_gmap/build.xml

(-0, +500)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/hibernate.properties

(-0, +7)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml

(-0, +208)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/org/.../lams/tool/gmap/model/GmapAttachment.hbm.xml

(-0, +93)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml

(-0, +156)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml

(-0, +111)

| History

| Source

· /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml

(-0, +101)

| History

| Source

· /lams_tool_gmap/conf/jar/META-INF/MANIFEST.MF

(-0, +3)

| History

| Source

· /lams_tool_gmap/conf/language/ApplicationResources.properties

(-0, +85)

| History

| Source

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties

(-0, +87)

| History

| Source

… 129 more files in changeset.