Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2b2959ec969dc53b7a097c27702bbd1a873473d1 -r66e0ef387697b413fc28adcf7ca665d03d8d4ef1
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2b2959ec969dc53b7a097c27702bbd1a873473d1)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 66e0ef387697b413fc28adcf7ca665d03d8d4ef1)
@@ -51,39 +51,46 @@
 		</td>
 	</tr>
 </table>
- 		
+
 <script type="text/javascript">
 <!--
-	function initGmap()
+
+function initGmap()
+{
+	if (GBrowserIsCompatible()) 
 	{
-		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) } );
-			//map.setCenter(new GLatLng(-33.774322, 151.111988), 13);
-	    	map.addControl(new GLargeMapControl());
-	    	map.addControl(new GMapTypeControl());
-	    	map.addMapType(G_PHYSICAL_MAP); 
-	
-	    	markers = new Array();
-	    	geocoder = new GClientGeocoder();
-	    	
-	    	//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, currUser, currUserId);
-			</c:forEach>
-			
-			refreshSideBar();
-	    }
-	}
-//-->
+		//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
+		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
+    	map.addControl(new GLargeMapControl());
+    	map.addControl(new GMapTypeControl());
+    	map.addMapType(G_PHYSICAL_MAP); 
+
+    	markers = new Array();
+    	geocoder = new GClientGeocoder();
+    	
+    	//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});
+		
+		addAuthorMarkers();	
+		refreshSideBar();
+		
+    }
+}
+
+function addAuthorMarkers()
+{
+	<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
+	addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, currUser, currUserId);
+	</c:forEach>		
+}
+
+-->
 </script>
+ 		
 
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r2b2959ec969dc53b7a097c27702bbd1a873473d1 -r66e0ef387697b413fc28adcf7ca665d03d8d4ef1
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 2b2959ec969dc53b7a097c27702bbd1a873473d1)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 66e0ef387697b413fc28adcf7ca665d03d8d4ef1)
@@ -1,5 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
@@ -17,18 +16,8 @@
 
 <script type="text/javascript">
 <!--
-	//var webAppUrl = "${tool}";
 	var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
 	var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
-	//var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>';
-	//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;