Index: lams_tool_gmap/build.xml
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/build.xml	(.../build.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/build.xml	(.../build.xml)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -206,6 +206,25 @@
 	   </target>
 
 	<!-- =================================================================== -->
+	<!-- Deploy the gmap jar                          -->
+	<!-- =================================================================== -->
+	<target name="deploy-jar" depends="build-jar" description="Deploy the tool jar file">
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
+		</delete>
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}" />
+		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/gmap">
+		   <fileset dir="${conf.language.dir}">
+		    <include name="**/*.properties"/>
+		    <include name="**/*.txt"/>
+		   </fileset>
+		</copy>
+	</target>
+	
+	
+	
+	<!-- =================================================================== -->
 	<!-- Deploy the gmap struts jar and war                               -->
 	<!-- =================================================================== -->
 	<target name="deploy-war" depends="build-war" description="Deploy the tool war file and jar file">
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -32,6 +32,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 
@@ -55,6 +56,33 @@
 	
 	//public boolean allowRichEditor;
 	
+	
+	public boolean allowEditMarkers;
+	
+	public boolean allowShowAllMarkers;
+	
+	public boolean limitMarkers;
+	
+	public int maxMarkers;
+	
+	public boolean allowZoom;
+	
+	public boolean allowTerrain;
+	
+	public boolean allowSatellite;
+	
+	public boolean allowHybrid;
+	
+	public Double mapCenterLatitude;
+	
+	public Double mapCenterLongitude;
+	
+	public int mapZoom;
+	
+	public String mapType;
+	
+	public Set<GmapMarker> gmapMarkers;
+	
 	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
 
 	public Set<GmapAttachmentDTO> offlineInstructionsFiles;
@@ -71,7 +99,20 @@
 		onlineInstructions = gmap.getOnlineInstructions();
 		offlineInstructions = gmap.getOfflineInstructions();
 		contentInUse = gmap.isContentInUse();
-		//allowRichEditor = gmap.isAllowRichEditor();
+		//allowRichEditor = gmap.isAllowRichEditor();		
+		allowEditMarkers = gmap.isAllowEditMarkers();		
+		allowShowAllMarkers = gmap.isAllowShowAllMarkers();		
+		limitMarkers = gmap.isLimitMarkers();		
+		maxMarkers = gmap.getMaxMarkers();
+		allowZoom = gmap.isAllowZoom();		
+		allowTerrain = gmap.isAllowTerrain();		
+		allowSatellite = gmap.isAllowSatellite();		
+		allowHybrid = gmap.isAllowHybrid();		
+		mapCenterLatitude = gmap.getMapCenterLatitude();		
+		mapCenterLongitude = gmap.getMapCenterLongitude();		
+		mapZoom = gmap.getMapZoom();
+		mapType = gmap.getMapType();
+		gmapMarkers = gmap.getGmapMarkers();
 
 		onlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
@@ -175,11 +216,117 @@
 		this.contentInUse = contentInUse;
 	}
 
+	public boolean isAllowEditMarkers() {
+		return allowEditMarkers;
+	}
+
+	public void setAllowEditMarkers(boolean allowEditMarkers) {
+		this.allowEditMarkers = allowEditMarkers;
+	}
+
+	public boolean isAllowShowAllMarkers() {
+		return allowShowAllMarkers;
+	}
+
+	public void setAllowShowAllMarkers(boolean allowShowAllMarkers) {
+		this.allowShowAllMarkers = allowShowAllMarkers;
+	}
+
+	public boolean isLimitMarkers() {
+		return limitMarkers;
+	}
+
+	public void setLimitMarkers(boolean limitMarkers) {
+		this.limitMarkers = limitMarkers;
+	}
+
+	public int getMaxMarkers() {
+		return maxMarkers;
+	}
+
+	public void setMaxMarkers(int maxMarkers) {
+		this.maxMarkers = maxMarkers;
+	}
+
+	public boolean isAllowZoom() {
+		return allowZoom;
+	}
+
+	public void setAllowZoom(boolean allowZoom) {
+		this.allowZoom = allowZoom;
+	}
+
+	public boolean isAllowTerrain() {
+		return allowTerrain;
+	}
+
+	public void setAllowTerrain(boolean allowTerrain) {
+		this.allowTerrain = allowTerrain;
+	}
+
+	public boolean isAllowSatellite() {
+		return allowSatellite;
+	}
+
+	public void setAllowSatellite(boolean allowSatellite) {
+		this.allowSatellite = allowSatellite;
+	}
+
+	public boolean isAllowHybrid() {
+		return allowHybrid;
+	}
+
+	public void setAllowHybrid(boolean allowHybrid) {
+		this.allowHybrid = allowHybrid;
+	}
+
+	public Double getMapCenterLatitude() {
+		return mapCenterLatitude;
+	}
+
+	public void setMapCenterLatitude(Double mapCenterLatitude) {
+		this.mapCenterLatitude = mapCenterLatitude;
+	}
+
+	public Double getMapCenterLongitude() {
+		return mapCenterLongitude;
+	}
+
+	public void setMapCenterLongitude(Double mapCenterLongitude) {
+		this.mapCenterLongitude = mapCenterLongitude;
+	}
+
+	public int getMapZoom() {
+		return mapZoom;
+	}
+
+	public void setMapZoom(int mapZoom) {
+		this.mapZoom = mapZoom;
+	}
+
+	public String getMapType() {
+		return mapType;
+	}
+
+	public void setMapType(String mapType) {
+		this.mapType = mapType;
+	}
+
+	public Set<GmapMarker> getGmapMarkers() {
+		return gmapMarkers;
+	}
+
+	public void setGmapMarkers(Set<GmapMarker> gmapMarkers) {
+		this.gmapMarkers = gmapMarkers;
+	}
+
 	//public boolean isAllowRichEditor() {
 	//	return allowRichEditor;
 	//}
 
 	//public void setAllowRichEditor(boolean allowRichEditor) {
 	//	this.allowRichEditor = allowRichEditor;
 	//}
+	
+	
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -396,8 +396,6 @@
 		toContent = (Gmap) fromContent.clone();
 		toContent.setToolContentId(toContentId);
 		toContent.setCreateDate(new Date());
-		Set<GmapMarker> set = new HashSet<GmapMarker>();
-		toContent.setGmapMarkers(set);
 		return toContent;
 	}
 
@@ -408,32 +406,36 @@
 			gmap = (Gmap) super.clone();
 			gmap.setUid(null);
 
+			Set<GmapAttachment> attachmentSet = new HashSet<GmapAttachment>();
+			Set<GmapMarker> markerSet = new HashSet<GmapMarker>();
+			
+			
 			if (gmapAttachments != null) {
 				// create a copy of the attachments
 				Iterator iter = gmapAttachments.iterator();
-				Set<GmapAttachment> set = new HashSet<GmapAttachment>();
 				while (iter.hasNext()) {
 					GmapAttachment originalFile = (GmapAttachment) iter.next();
 					GmapAttachment newFile = (GmapAttachment) originalFile.clone();
-					set.add(newFile);
+					attachmentSet.add(newFile);
 				}
-				gmap.gmapAttachments = set;
 			}
+			gmap.gmapAttachments = attachmentSet;
 			
 			if (gmapMarkers != null) {
 				// create a copy of the attachments
 				Iterator iter = gmapMarkers.iterator();
-				Set<GmapMarker> set = new HashSet<GmapMarker>();
 				while (iter.hasNext()) {
 					GmapMarker originalMarker = (GmapMarker) iter.next();
 					GmapMarker newMarker = (GmapMarker) originalMarker.clone();
-					set.add(newMarker);
+					markerSet.add(newMarker);
 				}
-				gmap.gmapAttachments = set;
+				
 			}
+			gmap.gmapMarkers = markerSet;
+				
 			// create an empty set for the gmapSession
-			gmap.gmapSessions = new HashSet();
-
+			gmap.gmapSessions = new HashSet<GmapSession>();
+			
 		} catch (CloneNotSupportedException cnse) {
 			log.error("Error cloning " + Gmap.class);
 		}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -112,11 +112,13 @@
 		request.setAttribute("mode", mode.toString());
 		learningForm.setToolSessionID(toolSessionID);
 
-		GmapDTO gmapDTO = new GmapDTO();
-		gmapDTO.title = gmap.getTitle();
-		gmapDTO.instructions = gmap.getInstructions();
+		//GmapDTO gmapDTO = new GmapDTO();
+		//gmapDTO.title = gmap.getTitle();
+		//gmapDTO.instructions = gmap.getInstructions();
 		//gmapDTO.allowRichEditor = gmap.isAllowRichEditor();
+		GmapDTO gmapDTO = new GmapDTO(gmap);
 		
+		
 		request.setAttribute("gmapDTO", gmapDTO);
 
 		// Set the content in use flag.
Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -19,4 +19,63 @@
 	<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 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 map;
+		var markers;
+		var geocoder = null;
+		function initLearnerGmap()
+		{
+			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.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
+				map.setZoom(${gmapDTO.mapZoom});
+
+				if (${gmapDTO.allowEditMarkers})
+				{
+				
+				}
+				
+				// Set up map controls
+				map.addControl(new GMapTypeControl());
+				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}">
+					
+					addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
+					
+					if (${gmapDTO.allowEditMarkers}){}
+					
+					if (${gmapDTO.allowShowAllMarkers}){}
+				</c:forEach>
+				
+				
+				var limitMarkers = ${gmapDTO.limitMarkers};
+				var markerLimit = markers.length + ${gmapDTO.maxMarkers};
+		    }
+		}
+	//-->
+	</script>
+	
+		
+	
+	
 </lams:head>
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -3,7 +3,6 @@
 var map;
 var markers;
 var geocoder = null;
-var markerManager = null;
 function init() {
 	// open the current tab    
 	var tag = document.getElementById("currentTab");
@@ -33,8 +32,6 @@
     	*/
     	markers = new Array();
     	geocoder = new GClientGeocoder();
-    	var mgrOptions = { trackMarkers: true };
-    	//markerManager = new GMarkerManager(map, mgrOptions);
     }
 }
 
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -206,22 +206,6 @@
    
 }
 
-/*
-function saveClick(x)
-{
-	var title=document.getElementById("markerTitle");
-	if (title==null || trim(title) == "")
-	{
-		alert("Title is required.");
-		return false;
-	}
-	else
-	{
-		saveMarkerInfo(x);
-	}
-}
-*/
-
 function saveMarkerInfo(x)
 {
 	if (markers[x] != null)
@@ -332,32 +316,23 @@
 		}	
 	}
 	xmlString += "</markers>"
-	document.authoringForm.markersXML.value=xmlString;
+	//document.authoringForm.markersXML.value=xmlString;
+	document.getElementById("markersXML").value=xmlString;
 }
 
 // TODO: This method should only be included for the authoring pages, put them in another file
 function saveMapState()
 {
-	document.authoringForm.mapZoom.value=map.getZoom();
-	document.authoringForm.mapCenterLatitude.value=map.getCenter().lat();
-	document.authoringForm.mapCenterLongitude.value=map.getCenter().lng();
-	
+	document.getElementById("mapZoom").value=map.getZoom();
+	document.getElementById("mapCenterLatitude").value=map.getCenter().lat();
+	document.getElementById("mapCenterLongitude").value=map.getCenter().lng();
 	var mapTypeName = map.getCurrentMapType().getName();
-	
-	alert("TYPE: " +mapTypeName);
-	
 	var mapType = "";	
-	if 		(mapTypeName == "Satellite") { mapType = "G_SATELLITE_MAP"; }
-	else if (mapTypeName == "Hybrid") { mapType = "G_HYBRID_MAP"; }
-	else if (mapTypeName == "Terrain") { mapType = "G_PHYSICAL_MAP"; }
-	else { mapType = "G_NORMAL_MAP"; }
-	
-	document.authoringForm.mapType.value=mapType;
-	
-	alert(document.authoringForm.mapZoom.value);
-	alert(document.authoringForm.mapCenterLatitude.value);
-	alert(document.authoringForm.mapCenterLongitude.value);
-	alert(document.authoringForm.mapType.value);
+	if 		(mapTypeName == "Satellite"){ mapType = "G_SATELLITE_MAP"; }
+	else if (mapTypeName == "Hybrid")	{ mapType = "G_HYBRID_MAP"; }
+	else if (mapTypeName == "Terrain") 	{ mapType = "G_PHYSICAL_MAP"; }
+	else 								{ mapType = "G_NORMAL_MAP"; }
+	document.getElementById("mapType").value=mapType;
 }
 
 
Index: lams_tool_gmap/web/layouts/learningLayout.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -5,7 +5,7 @@
 
 <lams:html>
 	<tiles:insert attribute="header" />
-	<body class="stripes">
+	<body class="stripes" onunload="GUnload()">
 		<tiles:insert attribute="body" />
 		<div class="footer">
 		</div>					
Index: lams_tool_gmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -2,6 +2,7 @@
 
 <!-- ========== Advanced Tab ========== -->
 
+
 <h2><fmt:message key="advanced.editingOptions" /></h2>
 
 <p class="small-space-top">
@@ -60,6 +61,16 @@
 	</label>
 </p>
 
+<script type="text/javascript">
+<!--
+	toggleMaxMarkerMenu();
+	function toggleMaxMarkerMenu()
+	{
+		document.getElementById("maxMarkers").disabled = !document.getElementById("limitMarkers").checked
+	}
+//-->
+</script>
+
 <h2><fmt:message key="advanced.mapOptions" /></h2>
 
 <p>
Index: lams_tool_gmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -36,11 +36,11 @@
 		<html:hidden property="currentTab" styleId="currentTab" />
 		<html:hidden property="dispatch" value="updateContent" />
 		<html:hidden property="sessionMapID" />
-		<html:hidden property="markersXML" value=""/>
-		<html:hidden property="mapZoom" value=""/>
-		<html:hidden property="mapCenterLatitude" value=""/>
-		<html:hidden property="mapCenterLongitude" value=""/>
-		<html:hidden property="mapType" value=""/>
+		<html:hidden property="markersXML" value="" styleId="markersXML" />
+		<html:hidden property="mapZoom" value="" styleId="mapZoom" />
+		<html:hidden property="mapCenterLatitude" value="" styleId="mapCenterLatitude" />
+		<html:hidden property="mapCenterLongitude" value="" styleId="mapCenterLongitude" />
+		<html:hidden property="mapType" value="" styleId="mapType" />
 
 
 		<div id="message" style="text-align: center;">
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -43,51 +43,42 @@
 			
 			<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="addMarkerToCenter()"  value="Add Marker" />
-			<input type="button" onclick="fitMapMarkers()" value="Fit Markers" />
-			-->
 			<input type="button" onclick="test()"  value="Test" />
 		</td>
 	</tr>
-	
 	<tr>
 		<td>
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.centerMap"></fmt:message>
 			</div>
 			<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>
-       		<!--  
-       		<input type="button" onclick="showAddress()" value="Go!" />
-       		-->
-       		
-       		
-       		<script type="text/javascript">
-			<!--
-	       		initGmap();
-       		//-->
-			</script>
-       		<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
-	        	<script type="text/javascript">
-				<!--
-					var savedPoint = new GLatLng('${marker.latitude}', '${marker.longitude}' );
-					addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
-				//-->
-				</script>
-      		</c:forEach>
-      		<script type="text/javascript">
-			<!--
-	       		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});
-	       		refreshSideBar();
-       		//-->
-			</script>
-
 		</td>
 	</tr>
 </table>
 
+<script type="text/javascript">
+<!--
+	initGmap();
+	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});
+//-->
+</script>
+
+<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
+	<script type="text/javascript">
+	<!--
+		var savedPoint = new GLatLng('${marker.latitude}', '${marker.longitude}' );
+		addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
+	//-->
+	</script>
+</c:forEach>
+   		
+<script type="text/javascript">
+<!--
+	refreshSideBar();
+//-->
+</script>
+
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -6,11 +6,13 @@
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
+
+<!--  
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
+<script src="http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js"></script>
+-->
 
-
 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script>
-<script src="http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js"></script>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r97ded6a90b089fe5e01c48c02f952e8b09d5a911
--- lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
@@ -53,25 +53,28 @@
 			${gmapDTO.instructions}
 		</p>
 
-		<c:set var="lrnForm"
-			value="<%=request
-									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 		<c:choose>
 			<c:when test="${contentEditable}">
-				<c:choose>
-					<c:when test="${gmapDTO.allowRichEditor}">
-						<lams:FCKEditor id="entryText" value="${lrnForm.entryText}"
-							toolbarSet="Default-Learner">
-						</lams:FCKEditor>
-					</c:when>
+				<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>
+				
+				<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>
+				
+				<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>
+				
 
-					<c:otherwise>
-						<html:textarea cols="60" rows="8" property="entryText"
-							styleClass="text-area"></html:textarea>
-					</c:otherwise>
-				</c:choose>
-
 				<div class="space-bottom-top align-right">
 					<html:submit styleClass="button" styleId="finishButton">
 						<fmt:message>button.finish</fmt:message>
@@ -84,6 +87,20 @@
 					<lams:out value="${lrnForm.entryText}" />
 				</c:otherwise>
 		</c:choose>
+		
+		<script type="text/javascript">
+		<!--
+			initLearnerGmap();
+		//-->
+		</script>
+		
+		
+		   		
+		<script type="text/javascript">
+		<!--
+			refreshSideBar();
+		//-->
+		</script>
 
 	</html:form>
 </div>