Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -19,17 +19,29 @@
 	<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"%>
+
+
 	<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 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 geocoder = null;
@@ -52,36 +64,49 @@
 				map.setZoom(${gmapDTO.mapZoom});
 
 				currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
-
-				if (${gmapDTO.allowEditMarkers})
-				{
 				
-				}
-				
 				// Set up map controls
 				map.addControl(new GMapTypeControl());
+				
+				<c:if test="${gmapDTO.allowZoom == true}">
+				map.addControl(new GLargeMapControl());
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowTerrain == true}">
+				map.addMapType(G_PHYSICAL_MAP);
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowSatellite == false}">
+				map.removeMapType(G_SATELLITE_MAP);
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowHybrid == false}">
+				   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}">
-					if (${marker.isAuthored})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-					}
-					else if ("${marker.createdBy.loginName}" == "${gmapUserDTO.loginName}" && !${marker.isAuthored})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-						userMarkerCount ++;
-					}
-					else if (${gmapDTO.allowShowAllMarkers})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-					}
+					<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}' );
+							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:otherwise>
+					</c:choose>
 				</c:forEach>
 
+		    	refreshSideBar();
 		    }
 		}
 	//-->