Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	6 Jun 2008 00:24:20 -0000	1.3
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	26 Jun 2008 00:21:08 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	6 Jun 2008 00:24:18 -0000	1.2
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	26 Jun 2008 00:21:06 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/common/learnerheader.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/web/common/learnerheader.jsp	6 Jun 2008 00:24:20 -0000	1.4
+++ lams_tool_gmap/web/common/learnerheader.jsp	26 Jun 2008 00:21:07 -0000	1.5
@@ -19,9 +19,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-	<!--  
-	<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
-	-->
 	<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsLearning.js"></script>
 
 	<%@ 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 @@
 				</c:if>
 				
 				<c:if test="${gmapDTO.allowHybrid == false}">
-				   map.removeMapType(G_HYBRID_MAP);
+				map.removeMapType(G_HYBRID_MAP);
 				</c:if>
 				
-				/*
-				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});
 		    	
 		    	<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">
 					<c:choose>
 						<c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}">
-						    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 ++;
 						</c:when>
+						
 						<c:otherwise>
-							<c:if  test="${marker.isAuthored || gmapDTO.allowShowAllMarkers}">
-							    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-							</c:if>
+							<c:choose>
+								<c:when  test="${marker.isAuthored}">
+								    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' );
+								</c:when>
+								<c:when  test="${gmapDTO.allowShowAllMarkers}">
+								    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
+								</c:when>
+							</c:choose>
 						</c:otherwise>
 					</c:choose>
 				</c:forEach>
Index: lams_tool_gmap/web/images/collapse.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/images/Attic/collapse.gif,v
diff -u
Binary files differ
Index: lams_tool_gmap/web/images/expand.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/images/Attic/expand.gif,v
diff -u
Binary files differ
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/javascript/Attic/mapFunctions.js,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	6 Jun 2008 00:24:19 -0000	1.7
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	26 Jun 2008 00:21:07 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	6 Jun 2008 00:24:19 -0000	1.2
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	26 Jun 2008 00:21:07 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	6 Jun 2008 00:24:19 -0000	1.2
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	26 Jun 2008 00:21:07 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/javascript/Attic/mapFunctionsMonitoring.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js	26 Jun 2008 00:21:07 -0000	1.1
@@ -0,0 +1 @@

\ No newline at end of file
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/includes/jsp/mapFunctions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	6 Jun 2008 00:24:19 -0000	1.1
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	26 Jun 2008 00:21:06 -0000	1.2
@@ -7,7 +7,7 @@
 <script type="text/javascript">
 <!--
 // 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;
@@ -17,6 +17,7 @@
 	
 	marker.editAble = editAble;
 	marker.createdBy = createdBy;
+	marker.createdById = createdById;
 	
     map.addOverlay(marker);
     
@@ -54,7 +55,8 @@
     if (isSaved){marker.state = "unchanged";}
     else {marker.state="unsaved";}
     
-	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'";
+	//marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'";
+	marker.sideBarIndex = markers.length;
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'><fmt:message key='button.remove'/></a>" ;
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'><fmt:message key='button.edit'/></a>";
    	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'><fmt:message key='button.save'/></a>";
@@ -68,13 +70,18 @@
 
 function refreshSideBar()
 {
+	//marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'";
 	var sideBarText = "";
 	var i=0;
 	for (;i<markers.length; i++)
 	{
 		if (markers[i].state != "remove" && markers[i].state != "unsaved")
 		{
-			sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
+			sideBarText += "<span class='sidebar'>";
+			sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' ";
+			sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>"
+			sideBarText += "</span><br />";
+			//sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
 		}
 	}
 	document.getElementById("sidebar").innerHTML = sideBarText;
@@ -214,6 +221,13 @@
 	document.getElementById("markersXML").value=xmlString;
 	return true;
 }
+
+
+function test()
+{
+	serialiseMarkers();
+	alert(document.getElementById("markersXML").value);
+}
 //-->
 </script>
 
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/basic.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/web/pages/authoring/basic.jsp	6 Jun 2008 00:24:20 -0000	1.7
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	26 Jun 2008 00:21:07 -0000	1.8
@@ -36,6 +36,7 @@
 			<tr><td>
 			<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
 			<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
+			<a href="javascript:test()" class="button"/>Test</a>
 			</td></tr>
 			</table>
 		</td>
@@ -67,14 +68,17 @@
 	    	markers = new Array();
 	    	geocoder = new GClientGeocoder();
 	    	
-	    	currUser = '${gmapUser.firstName} ${gmapUser.lastName}';
+	    	//currUser = '${gmapUser.firstName} ${gmapUser.lastName}';
+	    	//currUserId = '${gmapUser.uid}';
+	    	currUser = '<fmt:message key="label.authoring.basic.authored"></fmt:message>';
+	    	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});
 			
 			<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
-			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);
 			</c:forEach>
 			
 			refreshSideBar();
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/headItems.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	6 Jun 2008 00:24:20 -0000	1.7
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	26 Jun 2008 00:21:07 -0000	1.8
@@ -33,6 +33,7 @@
 	var markers;
 	var geocoder = null;
 	var currUser;
+	var currUserId;
 //-->
 </script>
 
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/learning/gmap.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_gmap/web/pages/learning/gmap.jsp	6 Jun 2008 00:24:20 -0000	1.3
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	26 Jun 2008 00:21:06 -0000	1.4
@@ -57,17 +57,24 @@
 
 		<c:choose>
 			<c:when test="${contentEditable}">
-				<table cellpadding='0' cellspacing='0' border='1'>
-				<tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ></div></td>
-				<td><div id="sidebar" style="width:100px; 
-										overflow:auto;
-										height:320px; 
-										background:WhiteSmoke; "></div></td></tr>
+			
+				<table style="cellpadding:0; cellspacing:0; border:0; width:500px;">
+					<tr>
+						<td width="80%">
+						<div id="map_canvas" style="width:400px;height:300px;" ></div></td>
+						<td width="10%">
+						<div id="sidebar" style="width:100px; overflow:auto;height:320px; background:WhiteSmoke; "></div>
+						</td>
+					</tr>
+					<tr>
+						<td>
+						<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
+						<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
+						</td>
+					</tr>
 				</table>
+
 				
-				<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
-				<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
-				<input type="button" onclick="test()"  value="Test" />
 				
 				<br><br>
 				
@@ -85,7 +92,7 @@
 
 			<c:otherwise>
 					<lams:out value="${lrnForm.entryText}" />
-				</c:otherwise>
+			</c:otherwise>
 		</c:choose>
 		
 		<script type="text/javascript">
Index: lams_tool_gmap/web/pages/monitoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/headItems.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_gmap/web/pages/monitoring/headItems.jsp	23 May 2008 06:29:10 -0000	1.1
+++ lams_tool_gmap/web/pages/monitoring/headItems.jsp	26 Jun 2008 00:21:06 -0000	1.2
@@ -4,6 +4,161 @@
 	<lams:WebAppURL />
 </c:set>
 
-<script type="text/javascript"
-	src="${tool}includes/javascript/monitoring.js">
+<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
+
+<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsMonitoring.js"></script>
+<%@ include file="/includes/jsp/mapFunctions.jsp"%>
+
+<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script>	
+<script type="text/javascript">
+<!--
+
+var webAppUrl = "${tool}";
+var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
+var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>';
+var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
+var createdByMsg = '<fmt:message key="label.createdBy"/>';
+var latitudeLongitudeMsg = '<fmt:message key="label.latitudelongitude"/>';
+var titleMsg = '<fmt:message key="label.authoring.basic.title"/>';
+var newInfoWindowTextMsg = '<fmt:message key="label.newInfoWindowText"/>';
+var editMsg = '<fmt:message key="button.Edit"/>';
+var saveMsg = '<fmt:message key="button.Save"/>';
+var removeMsg = '<fmt:message key="button.Remove"/>';
+var cancelMsg = '<fmt:message key="button.Cancel"/>';
+var map;
+var markers;
+var users;
+var geocoder = null;
+var currUser;
+var userMarkerCount =0;
+var limitMarkers = ${gmapDTO.limitMarkers};
+var markerLimit = 0;
+var markerLimit = ${gmapDTO.maxMarkers};
+
+function initMonotorGmap()
+{
+	if (GBrowserIsCompatible()) 
+	{
+		//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
+		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
+		markers = new Array();
+    	geocoder = new GClientGeocoder();
+    	
+		map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
+		map.setZoom(${gmapDTO.mapZoom});
+
+		currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
+		
+		// Set up map controls
+		map.addControl(new GMapTypeControl());
+		map.addControl(new GLargeMapControl());
+		map.addMapType(G_PHYSICAL_MAP);
+		
+		// Set map type
+		map.setMapType(${gmapDTO.mapType});
+    	
+    	<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">
+    		<c:choose>
+				<c:when test="${marker.isAuthored == true}">
+					addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0');
+				</c:when>
+				<c:otherwise>
+					addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
+				</c:otherwise>
+			</c:choose>
+		</c:forEach>
+		
+    	refreshSideBarMonitor();
+    	fitMapMarkers();
+    }
+}
+
+function addUserToList(id, name)
+{
+	var user = new Object();
+	user.name = name;
+	user.id = id;
+	users[users.length] = user;
+}
+
+function refreshSideBarMonitor()
+{
+	var sideBarText = "";
+	
+	var j=0;
+	var i;
+	
+	//sideBarText += "<a href='javascript:refreshSideBar()'>View All</a><br>";
+	for (;j<users.length; j++)
+	{
+		sideBarText += "<nobr><a href='javascript:makeUsersSideBarVisible(" + users[j].id + ");'>" + users[j].name + "</a></nobr><br>";
+		sideBarText += "<div style='display:none;' id='userdiv" + users[j].id + "'>";
+		for (i=0;i<markers.length; i++)
+		{
+			if (markers[i].createdById == users[j].id)
+			{
+				sideBarText += "<span class='sidebar'><nobr>";
+				sideBarText += "&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' ";
+				sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>"
+				sideBarText += "</span></nobr><br />";
+			}
+			
+		}
+		sideBarText += "</div>";
+	}
+	document.getElementById("usersidebar").innerHTML = sideBarText;
+}
+
+
+
+function makeUsersSideBarVisible(id)
+{
+	
+	var div = document.getElementById("userdiv" + id)
+	
+	if (div.style.display == "block")
+	{
+		document.getElementById("userdiv" + id).style.display = "none";
+	}
+	else if (div.style.display == "none")
+	{
+		document.getElementById("userdiv" + id).style.display = "block";
+	}
+	
+}
+
+/*
+function makeUsersSideBarVisible(id)
+{
+	var sideBarText = "";
+	var i=0;
+	for (;i<markers.length; i++)
+	{
+		
+		if (markers[i].state != "remove" && markers[i].state != "unsaved" && markers[i].createdById == id)
+		{
+			alert(markers[i].title + " Createdby: " + markers[i].createdBy + " " + markers[i].createdById + "\n" + id);
+			//sideBarText += "<a href='javascript:makeUsersSideBarVisible('" + markers[i].uid "');'>" + markers[i].createdBy + "</a>";
+			//sideBarText += "<div id='user" + markers[i].uid"' visible='false'>";
+			sideBarText += "<span class='sidebar'>";
+			sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' ";
+			sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>"
+			sideBarText += "</span><br />";
+			//sideBarText += "</div>";
+			
+		}
+	}
+	document.getElementById("sidebar").innerHTML = sideBarText;
+}
+*/
+
+
+//-->
 </script>
+	
+	
+	
+	
+	
+	
+
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	23 May 2008 06:29:10 -0000	1.1
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	26 Jun 2008 00:21:06 -0000	1.2
@@ -24,6 +24,29 @@
 		</tr>
 	</table>
 
+	
+	<table style="cellpadding:0; cellspacing:0; border:0; width:500px;">
+		<tr>
+			<td width="80%">
+			<div id="map_canvas" style="width:400px;height:300px;" ></div></td>
+			<td width="20%">
+			<div id="usersidebar" style="width:100px; overflow:auto;height:320px; background:WhiteSmoke; "></div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
+			</td>
+		</tr>
+	</table>
+	
+	<table>
+	<tr><td>
+		<input type="text" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+ 		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
+	</td></tr>
+	</table>
+	<!--  
 	<table cellpadding="0">
 
 		<tr>
@@ -35,7 +58,11 @@
 			</th>
 		</tr>
 
-
+		
+		
+		
+		
+		
 		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
 				<td width="30%">
@@ -58,4 +85,22 @@
 			</tr>
 		</c:forEach>
 	</table>
+	-->
+	
+	<script type="text/javascript">
+	<!--
+	users = new Array();
+	addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' );
+	<c:forEach var="user" items="${session.userDTOs}">
+	addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
+	</c:forEach>
+	//-->
+	</script>
+	
+	
+	<script type="text/javascript">
+	<!--
+		initMonotorGmap();
+	//-->
+	</script>
 </c:forEach>