Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -17,7 +17,7 @@ label.authoring.basic.title =Title: label.authoring.basic.content =Content: label.authoring.basic.instructions =Instructions: - +label.authoring.basic.authored =Authored label.authoring.basic.map =Map: label.authoring.basic.centerMap =Center map on location: label.authoring.basic.sampleAddress =Macquarie University, Sydney NSW Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -65,15 +65,12 @@ setupService(); - Long toolContentID = new Long(WebUtil.readLongParam(request, - AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); - String contentFolderID = WebUtil.readStrParam(request, - AttributeNames.PARAM_CONTENT_FOLDER_ID); + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - Gmap gmap = gmapService - .getGmapByContentId(toolContentID); - + Gmap gmap = gmapService.getGmapByContentId(toolContentID); + if (gmap == null) { // TODO error page. } Index: lams_tool_gmap/web/common/learnerheader.jsp =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -19,9 +19,6 @@ - <%@ include file="/includes/jsp/mapFunctions.jsp"%> @@ -46,6 +43,7 @@ var markers; var geocoder = null; var currUser; + var currUserId; var userMarkerCount =0; var limitMarkers = ${gmapDTO.limitMarkers}; var markerLimit = 0; @@ -60,10 +58,10 @@ geocoder = new GClientGeocoder(); map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' )); - map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' )); map.setZoom(${gmapDTO.mapZoom}); currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}'; + currUserId = '${gmapUserDTO.uid}' // Set up map controls map.addControl(new GMapTypeControl()); @@ -81,27 +79,27 @@ - map.removeMapType(G_HYBRID_MAP); + map.removeMapType(G_HYBRID_MAP); - /* - if (${gmapDTO.allowZoom}) {map.addControl(new GLargeMapControl());} - if (${gmapDTO.allowTerrain}) {map.addMapType(G_PHYSICAL_MAP);} - if (!${gmapDTO.allowSatellite}) {map.removeMapType(G_SATELLITE_MAP);} - if (!${gmapDTO.allowHybrid}) {map.removeMapType(G_HYBRID_MAP);} - */ map.setMapType(${gmapDTO.mapType}); - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' ); + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ),'${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}'); userMarkerCount ++; + - - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' ); - + + + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '', '0' ); + + + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' ); + + Index: lams_tool_gmap/web/images/collapse.gif =================================================================== diff -u Binary files differ Index: lams_tool_gmap/web/images/expand.gif =================================================================== diff -u Binary files differ Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/includes/javascript/mapFunctions.js (.../mapFunctions.js) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/includes/javascript/mapFunctions.js (.../mapFunctions.js) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -1,5 +1,5 @@ // add a marker at the given point -function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy) +function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy, createdById) { map.closeInfoWindow(); var marker; @@ -9,6 +9,7 @@ marker.editAble = editAble; marker.createdBy = createdBy; + marker.createdById = createdById map.addOverlay(marker); Index: lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js (.../mapFunctionsAuthoring.js) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js (.../mapFunctionsAuthoring.js) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -3,7 +3,7 @@ { var bounds = map.getBounds(); var point = bounds.getCenter(); - addMarker(point, "", "", -1, false, true, currUser); + addMarker(point, "", "", -1, false, true, currUser, currUserId); } Index: lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js (.../mapFunctionsLearning.js) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js (.../mapFunctionsLearning.js) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -11,7 +11,7 @@ } var bounds = map.getBounds(); var point = bounds.getCenter(); - addMarker(point, "", "", -1, false, true, currUser); + addMarker(point, "", "", -1, false, true, currUser, currUserId); userMarkerCount ++; } Index: lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js =================================================================== diff -u --- lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js (revision 0) +++ lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -0,0 +1 @@ \ No newline at end of file Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -7,7 +7,7 @@ Index: lams_tool_gmap/web/pages/authoring/basic.jsp =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -36,6 +36,7 @@ + Test @@ -67,14 +68,17 @@ markers = new Array(); geocoder = new GClientGeocoder(); - currUser = '${gmapUser.firstName} ${gmapUser.lastName}'; + //currUser = '${gmapUser.firstName} ${gmapUser.lastName}'; + //currUserId = '${gmapUser.uid}'; + currUser = ''; + currUserId = '0'; map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' )); map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' )); map.setZoom(${formBean.gmap.mapZoom}); map.setMapType(${formBean.gmap.mapType}); - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, "${marker.createdBy.firstName} ${marker.createdBy.lastName}"); + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, currUser, currUserId); refreshSideBar(); Index: lams_tool_gmap/web/pages/authoring/headItems.jsp =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/pages/authoring/headItems.jsp (.../headItems.jsp) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/pages/authoring/headItems.jsp (.../headItems.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -33,6 +33,7 @@ var markers; var geocoder = null; var currUser; + var currUserId; //--> Index: lams_tool_gmap/web/pages/learning/gmap.jsp =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/pages/learning/gmap.jsp (.../gmap.jsp) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/web/pages/learning/gmap.jsp (.../gmap.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -57,17 +57,24 @@ - - - + +
+ + + + + + +
+
+ +
+ + +
+ - - -

@@ -85,7 +92,7 @@ - +
+ + +<%@ include file="/includes/jsp/mapFunctions.jsp"%> + + + + + + + + + + Index: lams_tool_gmap/web/pages/monitoring/summary.jsp =================================================================== diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r2b2959ec969dc53b7a097c27702bbd1a873473d1 --- lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3299d560146318cb6f26ec2b234e3af70ec21eba) +++ lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 2b2959ec969dc53b7a097c27702bbd1a873473d1) @@ -24,6 +24,29 @@ + + + + + + + + + +
+
+
+
+ +
+ + + +
+ " /> + +
+ + + + + +